Synced translations with template

author: Jure Repinc <jure@mandriva.org> 2009-03-03 15:58:09 +0000
committer: Jure Repinc <jure@mandriva.org> 2009-03-03 15:58:09 +0000
commit: 53f630a042ffb907107d392c9f765d72af61d789 (patch)
tree: 866f32e62afc20482eb1db7a18ba41f0f4820b75
parent: 838598f7bdd3678add242c86602198b15417a3f9 (diff)
download: urpmi-53f630a042ffb907107d392c9f765d72af61d789.tar
urpmi-53f630a042ffb907107d392c9f765d72af61d789.tar.gz
urpmi-53f630a042ffb907107d392c9f765d72af61d789.tar.bz2
urpmi-53f630a042ffb907107d392c9f765d72af61d789.tar.xz
urpmi-53f630a042ffb907107d392c9f765d72af61d789.zip
65 files changed, 33705 insertions, 32916 deletions
diff --git a/po/af.po b/po/af.po
index 40b328f5..95c60e5a 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: Fri May 19 2000 13:02:12+0200\n"
 "Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: KTranslator v 0.6.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Stelsel-installasie"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -47,7 +47,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -57,7 +57,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -67,22 +67,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Installeer"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Stoor"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "Kanselleer"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, fuzzy, c-format
 msgid "Choose location to save file"
 msgstr "Kies 'n lêer"
@@ -179,12 +179,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Geen opdrag gespesifiseer nie"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Asseblief wag..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Muispoort"
@@ -212,42 +212,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Opgradeer"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Verlaat installasie"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "Staak"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -258,7 +258,7 @@ msgstr ""
 "%s\n"
 "Kan ons voort gaan?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -267,7 +267,7 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -276,44 +276,51 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakket, %d MB)"
 msgstr[1] "(%d pakkette, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, fuzzy, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Kan nie die bronpakette bekom nie."
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, fuzzy, c-format
 msgid "Preparing..."
 msgstr "Herlaaistelsel word voorberei..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installeer tans pakket %s (%s/%s)...."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laai tans pakket '%s' (%s/%s) af ..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "FAT-grootteverandering het gefaal: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Klaar"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -324,28 +331,27 @@ msgstr ""
 "%s\n"
 "Probeer u media se databasis opdateer."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Installasie het misluk"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Geïnstalleer"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "verwyder %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "Begin slurpd: "
@@ -419,58 +425,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, fuzzy, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "in lêername"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "FAT-grootteverandering het gefaal: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "Laat \"%s\" toe om die lêer te skryf"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, fuzzy, c-format
 msgid "error registering local packages"
 msgstr "Daar was 'n fout met pakkette:"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -510,22 +510,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -617,82 +617,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Aanteken gevaal"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "deur %s wat soek is"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "deur %s wat soek is"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "deur %s wat soek is"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "Verwyder %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "FAT-grootteverandering het gefaal: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "Aktiveer Network Time Protocol"
@@ -712,58 +717,58 @@ msgstr "%s is nie gevind nie...\n"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "Ondersoek die afgeleë medialêer '%s'..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "Probleme met die skep van 'n ssh identiteit"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "Kan nie die bronpakette bekom nie."
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "Probleme met Installasue van pakket %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "%s word installeer\n"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "FAT-grootteverandering het gefaal: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "Verwyder pakkette..."
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "Verwyder pakkette..."
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "%s word installeer\n"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Meer inligting rakende pakket..."
@@ -808,75 +813,80 @@ msgstr "Waarskuwing"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Installasie het misluk"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Installasie het misluk"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Die volgende pakkette geïnstalleer word:\n"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Die volgende pakkette geïnstalleer word:\n"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wil u op hierdie knoppie klik?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "%s word installeer\n"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "Begin %s:"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "%s word installeer\n"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "%s word installeer\n"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Installasie probleem"
@@ -1078,7 +1088,7 @@ msgstr "Installasie het misluk"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Installasie het misluk"
@@ -1118,32 +1128,32 @@ msgstr "Kopieer die lêer vir media '%s'..."
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "Ondersoek die afgeleë medialêer '%s'..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Ondersoek medialêer '%s'....."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "Voeg media by"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1158,94 +1168,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "Fout met die lees van lêer %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Jammer, swak keuse, probeer weer\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Soek"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "Redigeer media \"%s\":"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1328,296 +1343,6 @@ msgstr "Verwyder %s"
 msgid "unmounting %s"
 msgstr "fout met onthegting van %s: %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf uitgawe %s\n"
-"Kopiereg (C) 2002-2006 Mandriva.\n"
-"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
-"GPL.\n"
-"\n"
-"gebruik:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, fuzzy, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose       - woordryke modus.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Lys van data om te herstel:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-"\n"
-"                      DrakBackup Verslag \n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Konsole opstelling module"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr ""
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "Kopieer die lêer vir media '%s'..."
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "Kopieer die lêer vir media '%s'..."
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "Kopieer die lêer vir media '%s'..."
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1634,7 +1359,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Teruglus lêernaam: %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Die volgende pakkette geïnstalleer word:\n"
@@ -1644,47 +1369,47 @@ msgstr "Die volgende pakkette geïnstalleer word:\n"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "deur %s wat soek is"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "deur problematiese %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer promosie van %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "om %s te kan behou"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1696,7 +1421,7 @@ msgstr ""
 "\n"
 "Kan ons voort gaan?"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1708,12 +1433,12 @@ msgstr ""
 "\n"
 "Kan ons voort gaan?"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "om %s te kan behou"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "deur %s wat soek is"
@@ -1805,6 +1530,12 @@ msgstr "  --help         - druk hierdie help boodskap.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1832,22 +1563,22 @@ msgstr "  -v             - woordryke modus.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "Inligting rakende pakkette"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "Onbekend"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1858,17 +1589,17 @@ msgstr[1] ""
 "Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
 "\n"
 
-#: ../urpme:126
+#: ../urpme:128
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Geen etiket om te verwyder nie!"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Geen etiket om te verwyder nie!"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1882,45 +1613,323 @@ msgstr[1] ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "Onbekend"
 msgstr[1] "Onbekend"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Verwyder pakkette..."
 msgstr[1] "Verwyder pakkette..."
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (J/n) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Verwyderbare media"
 
-#: ../urpme:181
+#: ../urpme:185
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Aanteken gevaal"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Aanteken gevaal"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf uitgawe %s\n"
+"Kopiereg (C) 2002-2006 Mandriva.\n"
+"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
+"GPL.\n"
+"\n"
+"gebruik:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose       - woordryke modus.\n"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Lys van data om te herstel:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+"\n"
+"                      DrakBackup Verslag \n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Konsole opstelling module"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr ""
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -v             - woordryke modus.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2234,36 +2243,31 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Opgradeer"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Opgradeer"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Verlaat installasie"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Verlaat installasie"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2273,12 +2277,12 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Wat is u keuse (1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2286,7 +2290,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2294,40 +2298,40 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Wil u in elk geval voortgaan?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 "Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
 "\n"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2340,7 +2344,7 @@ msgstr ""
 "\n"
 "Kan ons voort gaan?"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2353,12 +2357,12 @@ msgstr ""
 "\n"
 "Kan ons voort gaan?"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2366,7 +2370,7 @@ msgid ""
 "%s\n"
 msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2379,39 +2383,39 @@ msgstr[1] ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Druk ENTER wanneer u reg is..."
@@ -2825,29 +2829,29 @@ msgstr "  -v             - woordryke modus.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Redigeer media \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "%s word installeer\n"
diff --git a/po/ar.po b/po/ar.po
index b8c41eb3..199b7314 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-09-05 17:40+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -22,22 +22,22 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
 "3\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "تثبيت RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_موافق"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "ماذا تودّ أن تفعل؟"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "تريد الاستمرار؟"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -88,22 +88,22 @@ msgstr ""
 "\n"
 "قد ترغب بحفظها فقط. ما هو اختيارك؟"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_تثبيت"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_حفظ"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "ال_غاء"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "اختر مكان حفظ الملف"
@@ -204,12 +204,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "لا توجد حزمة بالإسم %s"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "انتظر من فضلك..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "يجب أن تكون جذراً"
@@ -240,42 +240,42 @@ msgstr ""
 "%s\n"
 "استمرار على أي حال؟"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "موافق"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (للترقية)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (للتثبيت)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "خيارات الحزم"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "أحد الحزم التالية يُحتاج اليه:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "إ_جهاض"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -286,19 +286,19 @@ msgstr ""
 "%s\n"
 "هل من الممكن المتابعة؟"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -307,37 +307,44 @@ msgstr[1] "(%d حزم، %d م.ب.)"
 msgstr[2] "(%d حزم، %d م.ب.)"
 msgstr[3] "(%d حزم، %d م.ب.)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "لم يمكن الحصول على الحزمة المصدرية، جاري الإنهاء"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "جاري التحضير..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "جاري تنزيل الحزمة `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...فشل الإسترجاع: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "ا_نتهى"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -348,28 +355,27 @@ msgstr ""
 "%s\n"
 "ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "فشل التثبيت"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "انتهى التثبيت"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "جاري إزالة %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "إعادة تشغيل urpmi"
@@ -443,58 +449,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "جاري استخدام بيئة محددة على %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "تعذر فتح rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "اسم ملف rpm غير موجود [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "جاري استرجاع ملف rpm [%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...تم الاسترجاع"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...فشل الإسترجاع: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "لم يمكن الوصول الى ملف rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "تعذر تحليل \"%s\" في الملف [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "تعذر تسجيل ملف rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "خطأ في تسجيل الحزم المحلية"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "هذه العملية محظورة أثناء العمل في الوضع المحظور"
@@ -534,22 +534,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -641,82 +641,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "فشل النّسخ"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "بسبب فقدان %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "بسبب فقدان %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "بسبب فقدان %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "جاري إزالة %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...فشل الإسترجاع: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "بروتكول غير معرّف لـ%s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "لم يعثر على أي وسيلة تنزيل، وسائل التنزيل المدعومة هي: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "تعذر التعامل مع البروتوكول: %s"
@@ -736,58 +741,58 @@ msgstr "لم يمكن ايجاد الحزمة %s"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "جاري استرجاع ملفات rpm للوسيط \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "جاري انشاء معاملة للتثبيت على %s (حذف=%d، تثبيت=%d، ترقية=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "تعذر انشاء المعاملة"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "تعذر استخراج rpm من حزمة delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "تعذر تثبيث الحزمة %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "جاري تثبيت %s من %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...فشل الإسترجاع: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "جاري حذف الحزمة %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "جاري حذف الحزمة %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "جاري تثبيت %s من %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "معلومات إضافية حول الحزمة %s"
@@ -832,75 +837,80 @@ msgstr "تحذير"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "فشل التثبيت"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "فشل التثبيت"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "هل تريد متابعة التثبيت؟"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "جاري تثبيت %s من %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "جاري توزيع %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "جاري تثبيت %s من %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "جاري تثبيت %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "التثبيت ممكن"
@@ -1104,7 +1114,7 @@ msgstr "فشل نسخ [%s] (الملفّ صغير بشكل مثيل للشّكّ
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "جاري حساب md5sum لـhdlist المصدر المستحضر (أو التخليق)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "فشل نسخ [%s] (md5sum غير متطابقة)"
@@ -1144,32 +1154,32 @@ msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "جاري اختبار ملف pubkey لـ\"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...تم استيراد المفتاح %s من ملف pubkey \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "لم يمكن استيراد ملف pubkey الخاص بـ\"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "تمت اضافة الوسيط %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1184,94 +1194,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "جاري قراءة ملفات rpm من [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "لاNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "نyY"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (ن/ل)"
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "المعذرة، اختيار سئ، حاول مرة أخرى\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "خيارات الحزم"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "ابحث"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "جاري ازالة الوسيط \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1356,293 +1371,6 @@ msgstr "جاري تجهيز %s"
 msgid "unmounting %s"
 msgstr "جاري ازالة تجهيز %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf إصدارة %s\n"
-"حقوق النّسخ 2002-2006 ماندريبا.\n"
-"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"\n"
-"الاستعمال:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - إعرض معلومات الإصدار ثم اخرج\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - استخدم بيئة محدّدة (عادة تقرير خطا).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - لا تستخدم الوسيط المحدّد، مفصولة بفواصل.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - استخدم جذر آخر لتثبيت حزم rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - افرز الوسيط بناءً على النصّ الفرعي مفصول بفواصل.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - لا تطبع الأسماء المتشابهة.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - استخدم وسيط التحديث فقط.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - وضع التفصيل.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - اشمل نصّ perl بشكل مباشر كـ perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - معامل AND الثّنائي،.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - معامل OR الثّنائي،.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NOT أحاديّة.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  (              - قوس لجهة اليمين لفتح تعبير مجموعة.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"قائمة البيانات التي سيتم استرجاعها:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - استخدم واجهة X.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    الافتراضات هي %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - اطبع الصّفة جهاز التجميع : جهاز التجميع.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "اعدادات سطر الأوامر"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - اطبع الصّفة يعارض : كل التعارضات.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - اطبع الصّفة epoch: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - اطبع علامة المجموعة : المجموعة\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّف.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - اطبع حجم الصّفة : الصّفة.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - عرض التلخيص.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - وضع التفصيل.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1659,7 +1387,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "لا توجد حزمة بالإسم %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "الحزم التالية تحتوي على %s: %s"
@@ -1669,47 +1397,47 @@ msgstr "الحزم التالية تحتوي على %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "بسبب فقدان %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "بسبب عدم ارضاء %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "جاري محاولة ترقية %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "كي يتم الحفاظ على %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1718,7 +1446,7 @@ msgstr ""
 "يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1727,12 +1455,12 @@ msgstr ""
 "يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "كي يتم تثبيث %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "بسبب التعارض مع %s"
@@ -1823,6 +1551,12 @@ msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّ
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - استخدام جذر آخر لإزالة rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - استخدم جذر آخر لتثبيت حزم rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1852,22 +1586,22 @@ msgstr "  --verbose, -v  - وضع التفصيل.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - اختر كل الحزم المتفقة مع المعامل.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "يسمح للمستخدم الجذر فقط بحذف الحزم"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "حزم غير معروفة"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "حزمة غير معروفة"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1876,17 +1610,17 @@ msgstr[1] "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 msgstr[2] "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 msgstr[3] "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "لا شئ للإزالة"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "لا شئ للإزالة"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1896,7 +1630,7 @@ msgstr[1] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 msgstr[2] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 msgstr[3] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1905,7 +1639,7 @@ msgstr[1] "حزمة غير معروفة"
 msgstr[2] "حزمة غير معروفة"
 msgstr[3] "حزمة غير معروفة"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1914,31 +1648,306 @@ msgstr[1] "جاري حذف الحزمة %s"
 msgstr[2] "جاري حذف الحزمة %s"
 msgstr[3] "جاري حذف الحزمة %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (ن/ل)"
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "فشلت عملية الإزالة"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "فشلت عملية الإزالة"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf إصدارة %s\n"
+"حقوق النّسخ 2002-2006 ماندريبا.\n"
+"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"\n"
+"الاستعمال:\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - إعرض معلومات الإصدار ثم اخرج\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - استخدم بيئة محدّدة (عادة تقرير خطا).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - لا تستخدم الوسيط المحدّد، مفصولة بفواصل.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - افرز الوسيط بناءً على النصّ الفرعي مفصول بفواصل.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - لا تطبع الأسماء المتشابهة.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - استخدم وسيط التحديث فقط.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - وضع التفصيل.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - اشمل نصّ perl بشكل مباشر كـ perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - معامل AND الثّنائي،.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - معامل OR الثّنائي،.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NOT أحاديّة.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  (              - قوس لجهة اليمين لفتح تعبير مجموعة.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"قائمة البيانات التي سيتم استرجاعها:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - استخدم واجهة X.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    الافتراضات هي %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - اطبع الصّفة جهاز التجميع : جهاز التجميع.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "اعدادات سطر الأوامر"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - اطبع الصّفة يعارض : كل التعارضات.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - اطبع الصّفة epoch: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - اطبع علامة المجموعة : المجموعة\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّف.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - اطبع حجم الصّفة : الصّفة.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - عرض التلخيص.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - وضع التفصيل.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2276,48 +2285,43 @@ msgstr ""
 "خطأ: يبدو أن %s مركّب بوضع القراءة فقط.\n"
 "استخدم --allow-force لإجبار العملية."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (للترقية)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (للترقية)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (للتثبيت)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (للتثبيت)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "ما هو اختيارك؟ (1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2328,7 +2332,7 @@ msgstr ""
 "أقدم من المثبتة:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2339,19 +2343,19 @@ msgstr ""
 "أقدم من المثبتة:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "استمرار على أي حال؟"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (ن/ل)"
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2360,7 +2364,7 @@ msgstr ""
 "لا يمكن تثبيت بعض الحزم المطلوبة:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2369,12 +2373,12 @@ msgstr ""
 "لا يمكن تثبيت بعض الحزم المطلوبة:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2385,7 +2389,7 @@ msgstr ""
 "لكي تتم ترقية الحزم الأخرى:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2396,12 +2400,12 @@ msgstr ""
 "لكي تتم ترقية الحزم الأخرى:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2411,7 +2415,7 @@ msgstr ""
 "يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2420,27 +2424,27 @@ msgstr[1] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 msgstr[2] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 msgstr[3] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2449,12 +2453,12 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "اضغط Enter عند الاستعداد..."
@@ -2894,12 +2898,12 @@ msgstr "  -f             - أجبر توليد ملفات hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "يسمح للمستخدم الجذر فقط بتحديث الوسائط"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضافة وسيط)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2908,17 +2912,17 @@ msgstr ""
 "المدخل المطلوب تحديثه غير موجود\n"
 "(واحد من %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "تجاهل الوسط %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "تمكين الوسط %s"
diff --git a/po/az.po b/po/az.po
index 3620811d..597015ad 100644
--- a/po/az.po
+++ b/po/az.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2004-09-12 20:33+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -22,22 +22,22 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Sistem qurulumu"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Oldu"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, fuzzy, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "İndi nə etmək istəyirsiniz?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -74,7 +74,7 @@ msgstr ""
 "Bunun yerinə sadəcə olaraq qeyd etməyi də seçə bilərsiniz.\n"
 "Seçiminiz nədir?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -90,22 +90,22 @@ msgstr ""
 "Bunun yerinə sadəcə olaraq qeyd etməyi də seçə bilərsiniz.\n"
 "Seçiminiz nədir?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Qur"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Qeyd Et"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Ləğv Et"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Qeyd ediləcək ünvanı seçin"
@@ -209,12 +209,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Əmr tə'yin edilməyib"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Xahiş edirik gözləyin..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Siçan Qapısı"
@@ -244,42 +244,42 @@ msgstr ""
 "Bəzi istənən paketlər qurula bilmir:\n"
 "%s"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Oldu"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Yeniləmə"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Qurulumun sonu"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Ləğv Et"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -289,57 +289,64 @@ msgstr ""
 "Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paket, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "qaynaq paketi alına bilmir, çıxılır"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Hazırlanır..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketi qurulur (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' paketi endirilir..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...alış bacarılmadı: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Qurtardı"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -350,28 +357,27 @@ msgstr ""
 "%s\n"
 "Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Qurulum iflas etdi"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "hər şey onsuzda quruludur"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Qurulum bitdi"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s silinir"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi yenidən başladılır"
@@ -443,58 +449,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmb açıla bilmir"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "hökmsüz rpm fayı adı [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "[%s] rpm faylı alınır ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...alınma bitdi"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...alış bacarılmadı: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm faylı [%s] çatıla bilmir"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "[%s] faylındakı \"%s\" oxuna bilmədi"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm faylı qeydiyyatdan keçirilə bilmədi"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "yerli paket qeydiyyat xətası"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -534,22 +534,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -641,82 +641,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Köçütrmə bacarılmadı"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "%s əksik olduğuna görə"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "%s əksik olduğuna görə"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "%s əksik olduğuna görə"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "%s silinir"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...alış bacarılmadı: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s üçün müəyyən edilən protokol namə'lumdur"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch tapılmadı, dəstəklənən webfetch-lər: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "protokol istifadə edilə bilmir: %s"
@@ -736,58 +741,58 @@ msgstr "%s paketi tapılmadı."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "\"%s\" mediyumundan rpm faylları alınır..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "%s üstündə qurma üçün keçiş bitdi (sil=%d, qul=%d, yenilə=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "keçiş yaradıla bilmir"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "%s paketi çıxardıla bilmədi"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s paketi qurula bilmədi"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "%s qurulur"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...alış bacarılmadı: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "%s peketi silinir"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "%s peketi silinir"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "%s qurulur"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "%s peketi haqqında daha çox məlumat"
@@ -832,75 +837,80 @@ msgstr "Xəbərdarlıq"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Qurulum iflas etdi"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Qurulum iflas etdi"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Quruluma davam etmək istəyirsiniz ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "%s qurulur"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "%s paylanır"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "%s qurulur"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s qurulur"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Qurulum mümkündür"
@@ -1105,7 +1115,7 @@ msgstr "[%s] faylının köçürülməsi bacarılmadı (fayl şüphəli dərəc�
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "alınan mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] köçürülmə əməliyyatı bacarılmadı (md5sum uyğunsuzluğu)"
@@ -1145,32 +1155,32 @@ msgstr "\"%s\" medyası hdlist faylı tapılmadı"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı alınır..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" faylının pubkey'si yoxlanır..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\"nın pubkey faylından %s açarı idxal edildi"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\"  faylının pubkey'si idxal edilə bilmədi"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "\"%s\" medyası hdlist faylı tapılmadı"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "%s medyası əlavə edildi"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1185,94 +1195,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "rpm faylları [%s] üstündən oxunur"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "XxJjNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyBb"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (b/X) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Xətalı seçənək, təkrar sınayın\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Axtar"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "\"%s\" medyumu çıxardılır"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1354,298 +1369,6 @@ msgstr "%s bağlanır"
 msgid "unmounting %s"
 msgstr "%s ayrılır"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf buraxılış %s\n"
-"Müəllif Hüququ (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"istifadə qaydası:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - Buraxılıs mə'lumatını gösta,rər və çıxar\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - xüsusi mühit işlət (əsasən bir xəta raportu).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - vergüllə ayrılmış verilən mediya(lar)nı işlətmə.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - vergüllə ayrılmış alt qatarlara görə mediyanı sırala.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - identik sətirləri göstərmə.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - təfsilatlı mod.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - perl kodunu birbaşa perl -e kimi daxil et.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binary AND operatoru.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - OR operatoru.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NOT operatoru.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - sağ mötərizə qrup ifadəsini bağlamaq üçün.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Geri yüklənəcək mə'lumatların siyahısı:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - X ara üzünü işlət.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    ön qurğulusu %s-dir.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - taq url'sini göstər: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - taq inşa qovşağını göstər: inşa qovşağı.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Konsol quraşdırma modulu"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - taq toqquşmalarını göstər: bütün toqquşmalar.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - taq izahatını göstər: izahat.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - taq epoch'unu göstər: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - sadəcə paket adlarını göstər.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - paketdəki faylları göstər.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - taq qrupunu göstər: qrup.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - sadəcə paket adlarını göstər.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - sadəcə paket adlarını göstər.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - taq gətirənini göstər: bütün gətirənlər.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - taq lazımlılarını göstər: bütün lazımlılar.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - taq böyüklüyünü göstər: böyüklük.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - taq sourcerpm'ini göstər: source rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - taq icmalını göstər: icmal.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - taq url'sini göstər: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - təfsilatlı mod.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - paketdəki faylları göstər.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - adla birlikdə buraxılış, yayını və arch'ı da çap et.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "\"%s\" medyası hdlist faylı tapılmadı"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1662,7 +1385,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "%s adlı paket yoxdur"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
@@ -1672,47 +1395,47 @@ msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "hər şey onsuzda quruludur"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "hər şey onsuzda quruludur"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "hər şey onsuzda quruludur"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "%s əksik olduğuna görə"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "hər şey onsuzda quruludur"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "razı qalmayan %s olduğuna görə"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s irəliləndirməyə çalışılır"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'ı saxlamaq üçün"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1721,7 +1444,7 @@ msgstr ""
 "Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1730,12 +1453,12 @@ msgstr ""
 "Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s paket(lər)ini qurmaq üçün"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s ilə yaranan toqquşma səbəbiylə"
@@ -1827,6 +1550,12 @@ msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1854,38 +1583,38 @@ msgstr "  --verbose      - təfsilatlı mod.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - qaydaya uyğun gələn bütün paketləri seç.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Medianı silmə icazəsi ancaq ali istifadəçiyə verilib"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "namə'lum paketlər"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "na'məlum paket "
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "%s paketini silmək sisteminizi pozacaq"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Silinəcək heç bir şey yoxdur"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Silinəcək heç bir şey yoxdur"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1893,43 +1622,323 @@ msgid_plural ""
 msgstr[0] ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "na'məlum paket "
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%s peketi silinir"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (b/X) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "çıxardıla bilən avadanlıq \"%s\" olaraq alınır"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Çıxartma bacarılmadı"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Çıxartma bacarılmadı"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf buraxılış %s\n"
+"Müəllif Hüququ (C) 2002-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"istifadə qaydası:\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - Buraxılıs mə'lumatını gösta,rər və çıxar\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - xüsusi mühit işlət (əsasən bir xəta raportu).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - vergüllə ayrılmış verilən mediya(lar)nı işlətmə.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - vergüllə ayrılmış alt qatarlara görə mediyanı sırala.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - identik sətirləri göstərmə.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - təfsilatlı mod.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - perl kodunu birbaşa perl -e kimi daxil et.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binary AND operatoru.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - OR operatoru.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NOT operatoru.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - sağ mötərizə qrup ifadəsini bağlamaq üçün.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Geri yüklənəcək mə'lumatların siyahısı:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - X ara üzünü işlət.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    ön qurğulusu %s-dir.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - taq url'sini göstər: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - taq inşa qovşağını göstər: inşa qovşağı.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Konsol quraşdırma modulu"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - taq toqquşmalarını göstər: bütün toqquşmalar.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - taq izahatını göstər: izahat.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - taq epoch'unu göstər: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - sadəcə paket adlarını göstər.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - paketdəki faylları göstər.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - taq qrupunu göstər: qrup.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - sadəcə paket adlarını göstər.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - sadəcə paket adlarını göstər.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - taq gətirənini göstər: bütün gətirənlər.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - taq lazımlılarını göstər: bütün lazımlılar.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - taq böyüklüyünü göstər: böyüklük.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - taq sourcerpm'ini göstər: source rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - taq icmalını göstər: icmal.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - taq url'sini göstər: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - təfsilatlı mod.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - paketdəki faylları göstər.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - adla birlikdə buraxılış, yayını və arch'ı da çap et.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "\"%s\" medyası hdlist faylı tapılmadı"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2267,36 +2276,31 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Yeniləmə"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Yeniləmə"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Qurulumun sonu"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Qurulumun sonu"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2304,12 +2308,12 @@ msgid ""
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Seçiminiz? (1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2317,7 +2321,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2325,19 +2329,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Davam edilsin?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (B/x) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2346,7 +2350,7 @@ msgstr ""
 "Bəzi istənən paketlər qurula bilmir:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2355,12 +2359,12 @@ msgstr ""
 "Bəzi istənən paketlər qurula bilmir:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s paketini silmək sisteminizi pozacaq"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2371,7 +2375,7 @@ msgstr ""
 "aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2382,12 +2386,12 @@ msgstr ""
 "aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2397,45 +2401,45 @@ msgstr ""
 "Aşağıdakı asıllılıqları qurmaq üçün ali istifadəçi olmalısınız:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Hazır olanda Enter düyməsinə basın..."
@@ -2874,13 +2878,13 @@ msgstr "  -f             - hdlist fayllarının yaradılmasını məcbur et.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Medianı yeniləmə icazəsi ancaq ali istifadəçiyə verilib"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "yenilənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2889,17 +2893,17 @@ msgstr ""
 "güncəllənəcək giriş mövcud deyildir\n"
 "(%s dan (dən) biri)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" mediyumu dəyişdirilir:"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "\"%s\" medyumu çıxardılır"
diff --git a/po/bg.po b/po/bg.po
index 7b0f022c..09548f04 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2003-08-18 15:59+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -21,22 +21,22 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM Инсталация"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Добре"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "Какво бихте желали да направите?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -72,7 +72,7 @@ msgstr ""
 "\n"
 "Продължение?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -87,22 +87,22 @@ msgstr ""
 "\n"
 "Вие може би предпочитате само да го запишете. Какъв е вашият избор?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Инсталиране"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Запазване"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr " Отказ"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Изберете място за запис на файл"
@@ -203,12 +203,12 @@ msgstr "  --update       - създаване на ъпдейт посредни
 msgid "No packages specified"
 msgstr "Не е въведена команда"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Моля, изчакайте..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Трябва да бъдете root/админ"
@@ -239,42 +239,42 @@ msgstr ""
 "%s\n"
 "Продължение?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Добре"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr "(за обновяване)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr "(към инсталация)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Необходим е един от следните пакети:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Прекъсване"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -286,14 +286,14 @@ msgstr ""
 "%s\n"
 "Продължение"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -302,44 +302,51 @@ msgstr ""
 "бъдат инсталирани:\n"
 "%s\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d пакета"
 msgstr[1] "%d пакета"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "не мога да получа сорс пакетите, прекратявам"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Подготовка..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталиране на пакет `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Сваляне на пакет `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...грешка при получаване: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Готово"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -350,28 +357,27 @@ msgstr ""
 "%s\n"
 "Вие вероятно трябва да обновите вашата urpmi база данни."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Инсталацията провалена"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Пакета(тите) вече са инсталирани"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Инсталацията приключи"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "изтриване на %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "Стартира slurpd: "
@@ -446,58 +452,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "не мога да отворя rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "грешно rpm име на файла [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "получавам rpm файла [%s] ... "
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...получаването завършено"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...грешка при получаване: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm файлът [%s] е недостъпен"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "невъзможно да се обработи/парсва \"%s\" в файл [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "невъзможно регистрирането на rpm файл"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "грешка при регистрация на локалните пакети"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -537,22 +537,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -644,82 +644,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Неуспешно влизане"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "поради липсващ %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "поради липсващ %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "поради липсващ %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "изтриване на %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...грешка при получаване: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "Зададен е неизвестен протокол за %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "не е намерен  webfetch, поддържаните webfetch са: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "не мога да обработя протокол %s"
@@ -739,12 +744,12 @@ msgstr "пакет %s не е намерен."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "получаване на rpm файлове от източник \"%s\"... "
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -752,47 +757,47 @@ msgstr ""
 "създадена е транзакция за инсталиране върху %s (премахни=%d, инсталирай=%d, "
 "обнови=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "не може да се създаде/започне транзакция"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "невъзможно е премахването на пакет %s "
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "невъзможно инсталирането на пакет %s "
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "инсталиране %s\n"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...грешка при получаване: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "изтриване на пакет %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "изтриване на пакет %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "инсталиране %s\n"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Повече информация от пакет..."
@@ -837,75 +842,80 @@ msgstr "Предупреждение"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Инсталацията провалена"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Инсталацията провалена"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Следните пакети ще трябва да се инсталират:\n"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Следните пакети ще трябва да се инсталират:\n"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Искате ли да цъкнете на този бутон?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "инсталиране %s\n"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "Стартирам %s:"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "инсталиране %s\n"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "инсталиране %s\n"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Опит за инсталиране без проверка на зависимости? (д/Н) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Инсталацията е възможна"
@@ -1118,7 +1128,7 @@ msgstr "грешка при копиране на [%s] (файла е подоз
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "изчисляване на md5 сумата на копирания hdlist (или synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "грешко копие на [%s] (грешна md5sum)"
@@ -1158,32 +1168,32 @@ msgstr "не е намерен hdlist файл за източник  \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "четене на source hdlist (или synthesis) от \"%s\""
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "проверявам публичен ключ от \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...импортиран ключ %s от файл с публични ключове за \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "невъзможен импорт на файл с публични ключове от \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "не е намерен hdlist файл за източник  \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "добавен източник %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1198,94 +1208,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "четене на rpm файлове от [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "НнNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ДдDdYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (Д/н) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Съжалявам, грешен избор, опитайте отново\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Търси"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "премахване на източник \"%s\":"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1368,307 +1383,6 @@ msgstr "монтиране на %s"
 msgid "unmounting %s"
 msgstr "демонтиране на %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf версия %s\n"
-"Mandriva 2002-2006, всички права запазени.\n"
-"Това е свободен софтуер и може да бъде разпространяван според условиятана "
-"GNU GPL.\n"
-"\n"
-"начин на ползване:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - показва версията и излиза\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --update       - създаване на ъпдейт посредник.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --size          - отпечатва размера на тага: size."
-
-# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, fuzzy, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --update       - създаване на ъпдейт посредник.\n"
-
-# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --update       - създаване на ъпдейт посредник.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --url          - отпечатва url тага: url.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, fuzzy, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - обновява само източници на обновяване.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - показва всички съобщения\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -e              - включва perl код направо като perl -e .\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -e              - включва perl код направо като perl -e .\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e              - включва perl код направо като perl -e .\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr ""
-"  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr " -v             - показва всички съобщения\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr " -v             - показва всички съобщения\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Списък на данни за възстановяване:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  -g             - отпечатай също групите с имена.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                      по подразбиране е %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - отпечатва url тага: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --url          - отпечатва url тага: url.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Настройки на конзолата"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
-"(множество редове)."
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - отпечатва описание на тага: description."
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - показва това помощно съобщение.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --all           - отпечатва всички тагове.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - извежда файловете в пакет.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --url          - отпечатва url тага: url.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --all           - отпечатва всички тагове.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --all           - отпечатва всички тагове.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
-"(множество редове)."
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --url          - отпечатва url тага: url.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --url          - отпечатва url тага: url.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --url          - отпечатва url тага: url.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
-"(множество редове)."
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - отпечатва url тага: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr " -v             - показва всички съобщения\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - извежда файловете в пакет.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -r             - отпечатай версия и също така реализация с име.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "не е намерен hdlist файл за източник  \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "създаден е hdlist синтезис файл за източник \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "записване на лист файл за източник \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1685,7 +1399,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "няма пакет наречен %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Следните пакети съдържат %s: %s"
@@ -1695,47 +1409,47 @@ msgstr "Следните пакети съдържат %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Пакета(тите) вече са инсталирани"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Пакета(тите) вече са инсталирани"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Пакета(тите) вече са инсталирани"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "поради липсващ %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Пакета(тите) вече са инсталирани"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "поради неопределен %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "опит за избор на %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "за да се запази %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1745,7 +1459,7 @@ msgstr ""
 "обновени:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1755,12 +1469,12 @@ msgstr ""
 "обновени:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "за да се инсталира %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "поради конфликт с %s"
@@ -1855,6 +1569,12 @@ msgstr "  --summary       - отпечатва резюме за тага: summa
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --size          - отпечатва размера на тага: size."
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --size          - отпечатва размера на тага: size."
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1884,22 +1604,22 @@ msgstr "  --verbose, -v  - показва всички съобщения\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - избиране на всички съвпадащи пакети.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Само superuser-а има право да премахва пакети"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "неизвестни пакети"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "неизвестен пакет"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1910,17 +1630,17 @@ msgstr[1] ""
 "Премахването на тези пакети би разбило системата ви, съжалявам:\n"
 "\n"
 
-#: ../urpme:126
+#: ../urpme:128
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Няма маркер за изтриване!"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Няма маркер за изтриване!"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1930,45 +1650,334 @@ msgstr[0] ""
 msgstr[1] ""
 "За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "неизвестен пакет"
 msgstr[1] "неизвестен пакет"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "изтриване на пакет %s"
 msgstr[1] "изтриване на пакет %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (Д/н) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Преместваемо устройство е \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Неуспешно влизане"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Неуспешно влизане"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf версия %s\n"
+"Mandriva 2002-2006, всички права запазени.\n"
+"Това е свободен софтуер и може да бъде разпространяван според условиятана "
+"GNU GPL.\n"
+"\n"
+"начин на ползване:\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - показва версията и излиза\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, fuzzy, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --update       - създаване на ъпдейт посредник.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, fuzzy, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --update       - създаване на ъпдейт посредник.\n"
+
+# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --update       - създаване на ъпдейт посредник.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --url          - отпечатва url тага: url.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - обновява само източници на обновяване.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - показва всички съобщения\n"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -e              - включва perl код направо като perl -e .\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -e              - включва perl код направо като perl -e .\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e              - включва perl код направо като perl -e .\n"
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr ""
+"  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr " -v             - показва всички съобщения\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr " -v             - показва всички съобщения\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Списък на данни за възстановяване:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  -g             - отпечатай също групите с имена.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                      по подразбиране е %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - отпечатва url тага: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --url          - отпечатва url тага: url.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Настройки на конзолата"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
+"(множество редове)."
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - отпечатва описание на тага: description."
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - показва това помощно съобщение.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --all           - отпечатва всички тагове.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - извежда файловете в пакет.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --url          - отпечатва url тага: url.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --all           - отпечатва всички тагове.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --all           - отпечатва всички тагове.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
+"(множество редове)."
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --url          - отпечатва url тага: url.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --url          - отпечатва url тага: url.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --url          - отпечатва url тага: url.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
+"(множество редове)."
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - отпечатва url тага: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr " -v             - показва всички съобщения\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - извежда файловете в пакет.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -r             - отпечатай версия и също така реализация с име.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "не е намерен hdlist файл за източник  \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "създаден е hdlist синтезис файл за източник \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "записване на лист файл за източник \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2289,36 +2298,31 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "(за обновяване)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "(за обновяване)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "(към инсталация)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "(към инсталация)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2326,12 +2330,12 @@ msgid ""
 msgstr ""
 "За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Какъв е вашият избор? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2339,7 +2343,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2347,19 +2351,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Продължение въпреки всичко ?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Д/н) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2369,7 +2373,7 @@ msgstr ""
 "%s\n"
 "Продължение?"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2379,14 +2383,14 @@ msgstr ""
 "%s\n"
 "Продължение?"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 "Премахването на тези пакети би разбило системата ви, съжалявам:\n"
 "\n"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2397,7 +2401,7 @@ msgstr ""
 "трябва да бъдат премахнати за да бъдат обновени други\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2408,12 +2412,12 @@ msgstr ""
 "трябва да бъдат премахнати за да бъдат обновени други\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2421,7 +2425,7 @@ msgid ""
 "%s\n"
 msgstr "Трябва да сте root за да ползвате тази команда ! \n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2430,39 +2434,39 @@ msgstr[0] ""
 msgstr[1] ""
 "За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Натиснете Enter,когато сте готови..."
@@ -2890,12 +2894,12 @@ msgstr " -v             - активира създаване на hdlist фай
 msgid "Only superuser is allowed to update media"
 msgstr "Само superuser-а има правото да обновява източниците"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нищо за ъпгрейд (ползвай urpmi.addmedia за добавяне на източник)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2904,19 +2908,19 @@ msgstr ""
 "липсва опцията за обновяване\n"
 "(една от %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "игнориране на източник %s"
 
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "активиране на източник %s"
diff --git a/po/bn.po b/po/bn.po
index 098f0457..2bd0d2d7 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-02-13 13:39+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -34,22 +34,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "আরপিএম ইনস্টলেশন"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "ঠিক আছে (_ঠ)"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "আপনি কি করতে চান?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -85,7 +85,7 @@ msgstr ""
 "\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -100,22 +100,22 @@ msgstr ""
 "\n"
 "আপনি হয়তো এটা সেভ করে রাখতে চাইবেন। আপনার পছন্দ কি?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_ইনস্টল"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_সংরক্ষণ"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "বাতিল (_ত)"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "ফাইল সংরক্ষণ করার অবস্থান বেছে নিন"
@@ -216,12 +216,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "কোন নির্দেশ পাওয়া যায় নি"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "অবশ্যই root হতে হবে"
@@ -252,42 +252,42 @@ msgstr ""
 "%s\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "নোটিশ"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "ঠিক আছে"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (আপগ্রেডের জন্য)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (ইনস্টলের জন্য)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "নিম্নলিখিত প্যাকেজসমুহের মধ্যে একটির প্রয়োজন আছে:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_বাতিল"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -298,14 +298,14 @@ msgstr ""
 "%s\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "নিম্নলিখিত প্যাকেজগুলি ইনস্টল হতে যাচ্ছে, ডিপেন্ডেন্সিদের সন্তুষ্ট করতে (%d এমবি)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -313,44 +313,51 @@ msgstr ""
 "ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
 "%s\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d প্যাকেজ সমূহ"
 msgstr[1] "%d প্যাকেজ সমূহ"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "সোর্স প্যাকেজ গুলি পাওয়া যায়নি, থামানো হচ্ছে"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "প্রস্তুত করা হচ্ছে..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "অনুগ্রহ করে \"%s\" নামের মাধ্যম [%s] নামের ডিভাইসে প্রবেশ করান"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছে..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...আনতে ব্যর্থ হয়েছি: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_সম্পন্ন"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -361,28 +368,27 @@ msgstr ""
 "%s\n"
 "আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "ইনস্টলেশন ব্যর্থ"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s সরানো হচ্ছে"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi আবার শুরু করা হচ্ছে"
@@ -456,58 +462,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "%s-এর ওপর সুনির্দিষ্ট পরিবেশ ব্যবহার করো\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb খুলতে অক্ষম"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "অবৈধ rpm ফাইল নাম [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "rpm ফাইল [%s] আনা হচ্ছে..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...আনা হয়ে গেছে"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...আনতে ব্যর্থ হয়েছি: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm ফাইল [%s] ব্যবহার করা যাচ্ছে না"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "\"%s\"-এর পরিচয় [%s] ফাইলে দেয়া সম্ভব হয়নি"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "আরপিএম ফাইল রেজিস্টার করতে অক্ষম"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "স্থানীয় প্যাকেজসমূহ রেজিস্টার করতে সমস্যা হয়েছে"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -547,22 +547,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -654,82 +654,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "কপি করতে ব্যর্থ"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "%s অনুপস্থিতির কারনে"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "%s অনুপস্থিতির কারনে"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "%s অনুপস্থিতির কারনে"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "%s সরানো হচ্ছে"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...আনতে ব্যর্থ হয়েছি: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "অজানা প্রোটোকল নির্ধারনের জন্য %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "কোন webfetch পাওয়া যায়নি, সমর্থিত webfetch সমূহ হচ্ছে: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "%s প্রোটকল নিয়ন্ত্রন করা সম্ভব হয়নি"
@@ -749,59 +754,59 @@ msgstr "প্যাকেজ %s পাওয়া যায়নি।"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rpm ফাইল আনা হচ্ছে \"%s\" মাধ্যম থেকে..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "%s-এ ইনস্টল করার জন্য লেনদেন প্রস্তুত করা হচ্ছে (সরাও=%d, ইনস্টল=%d, আপগ্রেড=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "লেনদেন তৈরিতে অক্ষম"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "%s প্যাকেজ সরানো গেলনা"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s প্যাকেজ ইনস্টল করা যায়নি"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...আনতে ব্যর্থ হয়েছি: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "%s প্যকেজ সরানো হচ্ছে"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "%s প্যকেজ সরানো হচ্ছে"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "%s প্যাকেজের আরও তথ্য"
@@ -846,75 +851,80 @@ msgstr "নোটিশ"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "ইনস্টলেশন ব্যর্থ"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "ইনস্টলেশন ব্যর্থ"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "আপনি কি ইনস্টলেশন চলিয়ে যেতে চাচ্ছেন ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "বিতরণ করা হচ্ছে %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s ইনস্টল করা হচ্ছে"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "ডিপেন্ডেন্সিসমুহ পরীক্ষা না করে ইনস্টলেশনের চেষ্টা করবো? (y/N)"
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "আরও জোরালোভাবে ইনস্টলের চেষ্টার করবো (--force)? (y/N)"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "ইনস্টলেশন সম্ভব"
@@ -1120,7 +1130,7 @@ msgstr "[%s]-এর কপি ব্যর্থ হয়েছে (ফাইল�
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "উদ্ধারকৃত সোর্স hdlist (অথবা synthesis)-এর md5sum হিসেব করা হচ্ছে"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s]-এর কপি ব্যর্থ হয়েছে (md5sum মেলেনি)"
@@ -1160,32 +1170,32 @@ msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাই�
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\"-এর hdlist (বা synthesis) সোর্স আনা হচ্ছে..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\"-এর pubkey পরীক্ষা করছি..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\"-এর pubkey থেকে %s কী ইমপোর্ট করা হয়েছে"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\"-এর pubkey ইমপোর্ট করা যায়নি"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "মাধ্যম %s যোগ করা হয়েছে"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1200,94 +1210,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "[%s] থেকে আর-পি-এম ফাইল পড়া হচ্ছে"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nnন"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yyহ"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr "(y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "দুঃখিত, খারাপ পছন্দ, পুনরায় চেষ্টা করুন\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "অনুসন্ধান"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "\"%s\" মাধ্যম সরানো হচ্ছে"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1370,294 +1385,6 @@ msgstr "%s মাউন্ট করা হচ্ছে"
 msgid "unmounting %s"
 msgstr "%s আনমাউন্ট করা হচ্ছে"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf সংস্করণ %s\n"
-"কপিরাইট (C) ২০০২-২০০৬ ম্যান্ড্রিব।\n"
-"এটি মুক্ত সফ্টওয়্যার এবং GNU GPL এর নিয়মানুযায়ী হয়তো এটা পুনঃবিতরণ করা যাবে।\n"
-"\n"
-"ব্যবহার: urpmf [options] pattern-expression\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - সুনির্দিষ্ট পরিবেশ ব্যবহার করো (বিশেষত একটি ত্রুটি রিপোর্ট।)\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - প্রদত্ত মাধ্যম ব্যবহার করবেনা, কমা দিয়ে ভাগ করা।\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - কমা দ্বারা বিচ্ছিন্ন মতে মাধ্যম ক্রমান্বয়ে সাজাও।\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - identical লাইনসমূহহ ছাপাবে না।\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - শুধু আপডেট মিডিয়া ব্যবহার করো।\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose মোড।\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - perl কোড perl -e এর মতো সরাসরি অন্তর্ভুক্ত করো।\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - বানারি AND অপারেটর.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - বাইনারি OR অপারেটর.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - ইউনারি NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - group expression শেষ করার জন্য।\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"যে সকল তথ্য ব্যাক-আপ থেকে পুনরুদ্ধার করতে হবে তাদের তালিকা:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - ইন্টারফেস ব্যবহার করো।\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    %s ডিফল্ট।\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - build host: buildhost ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "কনসোল কনফিগারেশন মডিউল"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - all conflicts: conflicts ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --epoch        - description: description ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epoch: epoch ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - group: group ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - packager: packager ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - all provides: provides ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - all requires: requires ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - size: size ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - source rpm: sourcerpm ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --epoch        - summary: summary ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - verbose মোড।\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - ভার্সন, প্রকাশ এবং আর্ক এর সঙ্গে নাম ছাপাও।\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "\"%s\" মাধ্যমের জন্য hdlist synthesis ফাইল তৈরি করা হচ্ছে"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1674,7 +1401,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "%s নামের কোন প্যাকেজ নেই"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "এই প্যাকেজগুলিতে রয়েছে %s: %s"
@@ -1684,47 +1411,47 @@ msgstr "এই প্যাকেজগুলিতে রয়েছে %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "%s অনুপস্থিতির কারনে"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s অসন্তুষ্টির কারনে"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s প্রোমট করার চেষ্টা করছি"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s রাখার জন্য"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1733,7 +1460,7 @@ msgstr ""
 "নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1742,12 +1469,12 @@ msgstr ""
 "নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s ইনস্টলের জন্য"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s-এর সাথে সংঘাতের কারনে"
@@ -1838,6 +1565,12 @@ msgstr "  --packager     - packager: packager ট্যাগ ছাপাও।
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - rpm সরানোর জন্য আরেকটি root ব্যবহার করো।\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1867,39 +1600,39 @@ msgstr "  --verbose, -v     - verbose মোড।\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - expression মিলিয়ে সমস্ত প্যাকেজ নির্বাচন করো।\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "শুধুমাত্র superuser-এর প্যাকেজ সরাবার অনুমতি আছে"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "অজানা প্যাকেজসমুহ"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "অজানা প্যাকেজ"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "%s প্যাকেজ সরালে আপনার সিস্টেমের সমস্যা হবে"
 msgstr[1] "%s প্যাকেজ সরালে আপনার সিস্টেমের সমস্যা হবে"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "সরানোর মতো কিছুই নেই"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "সরানোর মতো কিছুই নেই"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1907,45 +1640,321 @@ msgid_plural ""
 msgstr[0] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
 msgstr[1] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "অজানা প্যাকেজ"
 msgstr[1] "অজানা প্যাকেজ"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%s প্যকেজ সরানো হচ্ছে"
 msgstr[1] "%s প্যকেজ সরানো হচ্ছে"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr "(y/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "স্থানান্তরযোগ্য ডিভাইসকে \"%s\" হিসেবে নেয়া হলো"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "সরাতে ব্যর্থ"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "সরাতে ব্যর্থ"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf সংস্করণ %s\n"
+"কপিরাইট (C) ২০০২-২০০৬ ম্যান্ড্রিব।\n"
+"এটি মুক্ত সফ্টওয়্যার এবং GNU GPL এর নিয়মানুযায়ী হয়তো এটা পুনঃবিতরণ করা যাবে।\n"
+"\n"
+"ব্যবহার: urpmf [options] pattern-expression\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - সুনির্দিষ্ট পরিবেশ ব্যবহার করো (বিশেষত একটি ত্রুটি রিপোর্ট।)\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - প্রদত্ত মাধ্যম ব্যবহার করবেনা, কমা দিয়ে ভাগ করা।\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - কমা দ্বারা বিচ্ছিন্ন মতে মাধ্যম ক্রমান্বয়ে সাজাও।\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - identical লাইনসমূহহ ছাপাবে না।\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - শুধু আপডেট মিডিয়া ব্যবহার করো।\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose মোড।\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - perl কোড perl -e এর মতো সরাসরি অন্তর্ভুক্ত করো।\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - বানারি AND অপারেটর.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - বাইনারি OR অপারেটর.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - ইউনারি NOT.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - group expression শেষ করার জন্য।\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"যে সকল তথ্য ব্যাক-আপ থেকে পুনরুদ্ধার করতে হবে তাদের তালিকা:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - ইন্টারফেস ব্যবহার করো।\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    %s ডিফল্ট।\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - build host: buildhost ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "কনসোল কনফিগারেশন মডিউল"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - all conflicts: conflicts ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --epoch        - description: description ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epoch: epoch ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - group: group ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - packager: packager ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - all provides: provides ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - all requires: requires ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - size: size ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - source rpm: sourcerpm ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --epoch        - summary: summary ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - verbose মোড।\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - ভার্সন, প্রকাশ এবং আর্ক এর সঙ্গে নাম ছাপাও।\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "\"%s\" মাধ্যমের জন্য hdlist synthesis ফাইল তৈরি করা হচ্ছে"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2291,48 +2300,43 @@ msgstr ""
 "সমস্যা: %s শুধুমাত্র পড়ার জন্য মাউন্ট করা মনে হচ্ছে।\n"
 "বলপুর্বক কাজের জন্য --allow-force ব্যবহার করুন।"
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (আপগ্রেডের জন্য)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (আপগ্রেডের জন্য)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (ইনস্টলের জন্য)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (ইনস্টলের জন্য)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "আপনার পছন্দ কি? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2343,7 +2347,7 @@ msgstr ""
 "সংস্করণের উপর নির্ভরশীল যার নতুন সংস্করণ ইনস্টল করা আছে:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2354,19 +2358,19 @@ msgstr ""
 "সংস্করণের উপর নির্ভরশীল যার নতুন সংস্করণ ইনস্টল করা আছে:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "অগ্রসর হবে?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "(Y/n)"
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2375,7 +2379,7 @@ msgstr ""
 "আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2384,12 +2388,12 @@ msgstr ""
 "আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s প্যাকেজ সরালে আপনার সিস্টেমের সমস্যা হবে"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2400,7 +2404,7 @@ msgstr ""
 "আপগ্রেড করার জন্য:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2411,12 +2415,12 @@ msgstr ""
 "আপগ্রেড করার জন্য:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2426,46 +2430,46 @@ msgstr ""
 "নিম্নলিখিত ডিপেন্ডেন্সিসমূহ ইনস্টল করার জন্য আপনাকে রুট হতে হবে:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
 msgstr[1] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "প্রস্তুত হলে Enter চাপুন..."
@@ -2903,12 +2907,12 @@ msgstr "  -f             - hdlist ফাইলসমূহ তৈরী কর�
 msgid "Only superuser is allowed to update media"
 msgstr "শুধুমাত্র superuser-ই মাধ্যম আপডেট করতে পারবে"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "আপডেট করার কিছুই নাই (মাধ্যম যোগ করতে urpmi.addmedia ব্যবহার করো)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2917,17 +2921,17 @@ msgstr ""
 "আপডেটের এন্ট্রি পাওয়া যাচ্ছে না\n"
 "(%s-এর একটা)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" মাধ্যমটি অগ্রাহ্য করা হচ্ছে"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "\"%s\" মাধ্যমটি সক্রিয় করা হচ্ছে"
diff --git a/po/br.po b/po/br.po
index d6f3469d..0bff8ae7 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-07 19:20+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1;plural=0\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Staliadur ar RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fazi : n'hell ket bet kavet ar restr %s, nullaet vo"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ya"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -43,7 +43,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "Gra ?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -73,22 +73,22 @@ msgstr ""
 "\n"
 "Martese e plij deoc'h enrollañ anezhañ kentoc'h. Petra a blij deoc'h ?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Staliañ"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Enrollañ"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Nullañ"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Dibabit lec'hiadur da enrollañ ar restr"
@@ -185,12 +185,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "N'eus pakad dibabet ebet"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Gortozit mar plij ..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Red eo da bezañ root"
@@ -221,42 +221,42 @@ msgstr ""
 "%s\n"
 "Kenderc'hel ar staliadur evelato ?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Diwallit"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ya"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (da vremanaat)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (da staliañ)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Choazh ar pakad"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unan eus ar pakadoù a-heul a zo war-nes bezañ staliet :"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Dilaoskel"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -268,56 +268,63 @@ msgstr ""
 "%s\n"
 "Kenderc'hel evelato ?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Ar pakad a-heul a zo war-nes bezañ staliet evit dalc'hen an ezhommoù :"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Ar pakadoù a-heul a zo war-nes bezañ staliet evit dalc'hen an ezhommoù :"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakad, %d Mo)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "n'hellan ket tigas ar pakadoù tarzh, emaon o terriñ"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "O prientiñ ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "O staliañ ar pakad `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Enlakait ar medium a vez graet « %s » anezhañ"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "O tigas ar pakad « %s » ..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... sac'het eo ar resev : %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Graet"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -325,28 +332,27 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Sac'het eo an staliadur :"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Staliet eo ar pakad(où) c'hoazh"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Echu eo ar staliadur"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "lemel %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "oc'h adloc'hañ urpmi"
@@ -418,58 +424,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "fazi en ur zigeriñ rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "n'eo ket mat an ar restr rpm [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "o tigas ar restr rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "... echu eo ar resev"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... sac'het eo ar resev : %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "n'eo ket possubl da voned ar restr rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "n'hellan ket bet lennet ar restr spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "n'hell ket bet enskrivet ar restr rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "fazi en ur enskrivañ ar pakadoù lec'hel"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -509,22 +509,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "n'eo ket endeo renkell ar chroot"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -616,82 +616,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "fazi en ur eilañ"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "mank a ra wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "mank a ra curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "mank a ra rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "mank a ra ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "mank a ra prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "mank a ra aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% a %s zo echu, ETA = %s, tizh = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% echu, tizh = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "o tegas %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "%s resevet"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "dianav eo ar c'homenad spisaet evit %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "n'hellan ket staliañ ar pakad %s"
@@ -711,58 +716,58 @@ msgstr "ar pakad %s n'eo ket bet kavet."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "o tigas ar restroù rpm eus ar medium « %s » ..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[oc'h adpakadiñ]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "n'hell ket bet krouet ur gra"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "n'hell ket eztennet an rpm deus ar pakad delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "n'hellan ket staliañ ar pakad %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "o lemel pakad fall (%s) eus %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "sac'het eo bet lemel %s : %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "O lemel ar pakad %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "lemel pakad %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "o lemel pakadoù staliet (%s) eus %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Titouroù muioc'h diwwar-benn ar pakad %s"
@@ -807,18 +812,23 @@ msgstr "o nulaat"
 msgid "%s database is locked (another program is already using it)"
 msgstr "krouilhet eo stlennvon %s (ur program all zo oc'h implij anezhi)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Sac'het eo an staliadur"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -827,57 +837,57 @@ msgstr ""
 "Sac'het eo an staliadur, fall eo pakadoù :\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Fellout a ra deoc'h kenderc'hel staliañ ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "o lemel pakadoù staliet (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "o skignañ %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "o staliañ %s eus %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "o staliañ %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Klask staliañ hep sell ouzh an ezhommoù ? (y/N)"
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
+msgstr "evit staliañ %s"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Bremañaet eo ar pakadoù"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Possubl eo an staliadur"
@@ -1079,7 +1089,7 @@ msgstr "sac'het eo eil [%s] (re vihan eo ar restr)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "o jediñ md5sum ar synthesis degaset"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "sac'het eo degas [%s] (ne glot ket ar md5sum)"
@@ -1119,32 +1129,32 @@ msgstr "n'eus restr synthesis kavet ebet evit ar medium « %s »"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "o resev synthesis tizh evit « %s » ..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "o sell ouzh restr pubkey « %s » ..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... bez e oa enporzhet an alc'hwezh %s eus restr pubkey « %s »"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "n'hell ket bet enporzhet restr pubkey « %s »"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "n'eus restr synthesis kavet ebet evit ar medium « %s »"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "bremañet eo bet ar medium « %s »"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "sac'het eo bet degas [%s]"
@@ -1159,94 +1169,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "o lenn roll ar melezourioù eus %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyOo"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N)"
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Ho tigarez, fall eo an dibab-mañ, klaskit adarre\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pakad"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Stumm"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Stummig"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr ""
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(damantet)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "medium « %s »"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "b"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "ko"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "Mo"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "Go"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "To"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1328,294 +1343,6 @@ msgstr "o marc'hañ %s"
 msgid "unmounting %s"
 msgstr "o divarc'hañ %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf stumm %s\n"
-"Copyright (C) 2003-2006 Mandriva.\n"
-"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
-"GPL.\n"
-"\n"
-"arveriadur : urpmf [dibarzhoù] sil\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr ""
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - implij ur gwrizienn all evit stlennvon urpmi hag evit "
-"staliañ pakadoù.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr ""
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr ""
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr ""
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr ""
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr ""
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr ""
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr ""
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr ""
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - ostiz ar sevel\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - amzer ar sevel\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    -restroù kefluniadur\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - deskrivadur ar pakad\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr ""
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - anv restr ar pakad\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - roll ar restroù hag a zo er pakad\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - strollad\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - anv ar pakad\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - anv ar pakad\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr ""
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - ment pa 'vez staliet\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - anv ar rpm tizh\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - liketennoù damantet\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - diverrañ\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr ""
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr ""
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "n'eus restr hdlist ebet evit ar medium « %s »"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "n'eus restr synthesis ebet evit ar medium « %s »"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "n'eus titour XML ebet evit ar medium « %s »"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1632,7 +1359,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "N'eus pakad ebet ket a vez graet %s anezhañ"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s zo er pakadoù a-heul : %s"
@@ -1642,47 +1369,47 @@ msgstr "%s zo er pakadoù a-heul : %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "N'hell ket bet staliet ar pakadoù %s"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Staliet eo ar pakad %s c'hoazh"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Staliet eo ar pakadoù %s c'hoazh"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "peogwir %s zo manket"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "peogwir eo staliet ar pakad %s c'hoazh"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "peogwir %s zo manket"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "N'eus pakad da zilemel ebet"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "evit mirout %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1691,7 +1418,7 @@ msgstr ""
 "Red eo lemel ar pakad-mañ a-raok staliañ ar re nevez all:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1700,12 +1427,12 @@ msgstr ""
 "Red eo lemel ar pakadoù-mañ a-raok staliañ ar re nevez all:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "evit staliañ %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "peogwir %s zo manket"
@@ -1797,6 +1524,14 @@ msgstr "  --adpakadiñ    - Adpakadiñ ar restroù a-raok lemel anezho\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - implij ur gwrizienn all evit lemel pakadoù.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - implij ur gwrizienn all evit stlennvon urpmi hag evit "
+"staliañ pakadoù.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1824,38 +1559,38 @@ msgstr ""
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Ar gourarveriad hepken a c'hell lemel pakadoù"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "dianav eo ar pakadoù"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pakad anavez"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "sac'het e vo ho reizhiad ma eo lemelet ar pakad %s"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "N'eus pakad da zilemel ebet"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "N'eus pakad da zilemel ebet"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1863,43 +1598,317 @@ msgid_plural ""
 msgstr[0] ""
 "Ar %d pakad a-heul a zo war-nes bezañ distaliet evit dalc'hen an ezhommoù :"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "pakad anavez"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Lemel %d pakad ?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N)"
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Trobarzhell lem-laka"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Fazi en ur lemel"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Fazi en ur lemel"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf stumm %s\n"
+"Copyright (C) 2003-2006 Mandriva.\n"
+"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
+"GPL.\n"
+"\n"
+"arveriadur : urpmf [dibarzhoù] sil\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr ""
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr ""
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr ""
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr ""
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr ""
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr ""
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr ""
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - ostiz ar sevel\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - amzer ar sevel\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    -restroù kefluniadur\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - deskrivadur ar pakad\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr ""
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - anv restr ar pakad\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - roll ar restroù hag a zo er pakad\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - strollad\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - anv ar pakad\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - anv ar pakad\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr ""
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - ment pa 'vez staliet\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - anv ar rpm tizh\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - liketennoù damantet\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - diverrañ\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr ""
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr ""
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "n'eus restr hdlist ebet evit ar medium « %s »"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "n'eus restr synthesis ebet evit ar medium « %s »"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "n'eus titour XML ebet evit ar medium « %s »"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2213,36 +2222,31 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s : %s (evit bremanaat)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (evit bremanaat)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s : %s (evit staliañ)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (evit staliañ)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2251,12 +2255,12 @@ msgstr ""
 "Unan eus ar pakadoù a-heul a zo ret bezañ staliet evit dalc'hen an ezhomm « %"
 "s » :"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Petra eo ho choazh ? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2264,7 +2268,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2272,7 +2276,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2281,12 +2285,12 @@ msgstr ""
 "\n"
 "Kenderc'hel evelato ?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n)"
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2295,7 +2299,7 @@ msgstr ""
 "Ne m'eus ket gallet staliañ ur pakad goulennet :\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2304,12 +2308,12 @@ msgstr ""
 "Ne m'eus ket gallet staliañ un darn pakad goulennet :\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "sac'het e vo ho reizhiad ma eo lemelet ar pakad %s"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2317,7 +2321,7 @@ msgid ""
 "%s\n"
 msgstr "Red eo da lemel ar pakadoù-mañ"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2325,12 +2329,12 @@ msgid ""
 "%s\n"
 msgstr "Red eo da lemel ar pakadoù-mañ"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2338,45 +2342,45 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] ""
 "Ar %d pakad a-heul a zo war-nes bezañ distaliet evit dalc'hen an ezhommoù :"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s egor pladenn ouzphenn a vo bet implijet."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s egor pladenn a vo bet dieubet."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s a bakad a vo bet degaset."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "War-nes bezañ staliañ eo %d pakad. Mont war-raok ?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Gwaskit « enkas » pa eo prest ar vedium ..."
@@ -2792,13 +2796,13 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Ar gourarveriad hepken a c'hell bremañaat ar media"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "bez eus netra da vremañaat (implij urpmi.addmedia evit ouzhpennañ ur vedia)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2807,17 +2811,17 @@ msgstr ""
 "mankout a ra ar vouetadur da vremañaat\n"
 "(unan eus %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "« %s »"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "o tremen e-biou ar vedia %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "o bevaat ar media %s"
diff --git a/po/bs.po b/po/bs.po
index d63c6eaa..4390d33f 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2006-09-13 21:02+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -22,22 +22,22 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM instalacija"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Greška: ne mogu naći datoteku %s, prekidam operaciju"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_U redu"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "Šta želite uraditi?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Da nastavim?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -88,22 +88,22 @@ msgstr ""
 "\n"
 "Možda želite da ih samo snimite. Šta je vaš izbor?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instaliraj"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Snimi"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Izaberi lokaciju za snimanje"
@@ -207,12 +207,12 @@ msgstr "  --searchmedia  - koristi samo navedene medije za pretragu paketa.\n"
 msgid "No packages specified"
 msgstr "Nije naveden paket"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Molim sačekajte..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Morate biti root"
@@ -243,42 +243,42 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (za ažuriranje)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (za instalaciju)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Izbor paketa"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od sljedećih paketa je potreban:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -289,19 +289,19 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -309,37 +309,44 @@ msgstr[0] "(%d paketa, %d MB)"
 msgstr[1] "(%d paketa, %d MB)"
 msgstr[2] "(%d paketa, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dobiti izvorne pakete, prekidam"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloadujem paket `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...dobavljanje nije uspjelo: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Gotovo"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -350,28 +357,27 @@ msgstr ""
 "%s\n"
 "Možda ćete trebati osvježiti vašu urpmi bazu podataka"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalacija nije uspjela:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalacija završena"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "uklanjam %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
@@ -445,58 +451,52 @@ msgstr "Direktorij okruženja %s ne postoji"
 msgid "using specific environment on %s\n"
 msgstr "koristim navedenu okolinu na %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ne mogu otvoriti rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "neispravno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dobavljam rpm datoteku [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...download završen"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...dobavljanje nije uspjelo: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ne mogu obraditi spec datoteku %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu registrovati rpm datoteku"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Nekompatibilna arhitektura za paket [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "greška pri registrovanju lokalnih paketa"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ova operacija je zabranjena dok ste u ograničenom režimu"
@@ -536,22 +536,22 @@ msgstr "Izrazi za uzorke:\n"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Previše argumenata\n"
@@ -643,82 +643,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Kopiranje nije uspjelo"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "uklanjam %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...dobavljanje nije uspjelo: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "nepoznat protokol je definisan za %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nije pronađen download program, podržani su: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ne mogu rukovati protokolom: %s"
@@ -738,12 +743,12 @@ msgstr "paket %s nije pronađen"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "dobavljam rpm datoteke za medij \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[prepakujem]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -751,47 +756,47 @@ msgstr ""
 "napravio transakciju za instaliranje na %s (ukloni=%d, instaliraj=%d, "
 "unaprijedi=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "ne mogu napraviti transakciju"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ne mogu ekstraktovati rpm iz delta-rpm paketa %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "ne mogu instalirati paket %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "instaliram %s iz %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...dobavljanje nije uspjelo: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "uklanjam paket %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "uklanjam paket %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "instaliram %s iz %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Više informacija o paketu %s"
@@ -836,75 +841,80 @@ msgstr "Upozorenje"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Instalacija nije uspjela na čvoru %s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Sljedeći paketi imaju neispravne potpise"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sljedeći paketi imaju neispravne potpise"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Želite li nastaviti instalaciju ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "instaliram %s iz %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuiram %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "instaliram %s iz %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instaliram %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalacija nije moguća"
@@ -1110,7 +1120,7 @@ msgstr "kopiranje [%s] nije uspjelo (datoteka je sumnjivo mala)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "izračunavam md5sum za dobavljeni hdlist (ili synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] nije uspjelo (md5sum se ne poklapa)"
@@ -1150,32 +1160,32 @@ msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "istražujem pubkey datoteku za \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...uveo sam ključ %s iz pubkey datoteke \"%s\"-a"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu uvesti pubkey datoteku za \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "dodao medij %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1190,94 +1200,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "čitam RPM datoteke iz [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "DdYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (d/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Žalim, pogrešan izbor, probajte kasnije\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "Izbor paketa"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr ""
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1361,298 +1376,6 @@ msgstr "montiram %s"
 msgid "unmounting %s"
 msgstr "demontiram %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf verzija %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
-"\n"
-"upotreba: urpmf [opcije] izraz\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - ispisuje broj verzije ovog alata.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - koristi navedenu okolinu (tipično izvještaj o bugu).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ne koristi navedene medije, razdvojene zarezom.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - bez prepoznavanja uzorka, koristi argument kao doslovan "
-"tekst.\n"
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - koristi drugi dir. za rpm instalaciju.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortiraj medije prema podstringovima razdvojenim "
-"zarezom.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ne ispisuj identične linije.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo medije za unaprjeđenje.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - rječiti mod.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ne razlikuj velika i mala slova u uzorcima.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - razlikuj velika i mala slova u uzorcima.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - promjena razdjelnika polja (standardno je ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Izrazi za uzorke:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - svaki tekst se tretira kao regexp, osim ako se koristi -"
-"I.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - uključi perl kod direktno kao perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binarni I operator.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binarni OR operator.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unarno NE.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - lijeva i desna zagrada.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Spisak tagova:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - određuje format izlaza nalik na printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   primjer: '%%ime:%%datoteke'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arhitektura\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - računar na kojem je kompajliran\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - vrijeme kompajliranja\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - konfiguracione datoteke\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - tagovi za konflikte\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - opis paketa\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribucija\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epoha\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - ime datoteke paketa\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - lista datoteka u paketu\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grupa\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - ime paketa\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - ime paketa\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - autor paketa\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - tag 'pruža'\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - tag 'zahtijeva'\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - veličina nakon instalacije\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - naziv izvornog rpm-a\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - sažetak.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - izdavač\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - medij na kojem je paket pronađen\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "ispisujem list datoteku za medij \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1669,7 +1392,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nema paketa pod imenom %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sljedeći paketi sadrže %s: %s"
@@ -1679,47 +1402,47 @@ msgstr "Sljedeći paketi sadrže %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog nezadovoljenih %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokušavam promovirati %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "kako bi zadržao %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1728,7 +1451,7 @@ msgstr ""
 "Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1737,12 +1460,12 @@ msgstr ""
 "Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "da bih instalirao %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zbog konflikta sa %s"
@@ -1834,6 +1557,12 @@ msgstr "  --repackage    - Prepakuj datoteke prije brisanja\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - koristi drugi korijen za uklanjanje RPM-a.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - koristi drugi dir. za rpm instalaciju.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1863,22 +1592,22 @@ msgstr "  --verbose, -v  - rječiti mod.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Samo administrator (superkorisnik) može uklanjati pakete"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "nepoznati paket"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "nepoznat paket"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1886,17 +1615,17 @@ msgstr[0] "uklanjanje paketa %s će pokvariti vaš sistem"
 msgstr[1] "uklanjanje paketa %s će pokvariti vaš sistem"
 msgstr[2] "uklanjanje paketa %s će pokvariti vaš sistem"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nema ništa za uklanjanje"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nema ništa za uklanjanje"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1905,7 +1634,7 @@ msgstr[0] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 msgstr[1] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 msgstr[2] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1913,7 +1642,7 @@ msgstr[0] "nepoznat paket"
 msgstr[1] "nepoznat paket"
 msgstr[2] "nepoznat paket"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1921,31 +1650,311 @@ msgstr[0] "Da uklonim %d paketa?"
 msgstr[1] "Da uklonim %d paketa?"
 msgstr[2] "Da uklonim %d paketa?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (d/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "uzimam izmjenjivi uređaj kao \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Uklanjanje nije uspjelo"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Uklanjanje nije uspjelo"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf verzija %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
+"\n"
+"upotreba: urpmf [opcije] izraz\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - ispisuje broj verzije ovog alata.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - koristi navedenu okolinu (tipično izvještaj o bugu).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - ne koristi navedene medije, razdvojene zarezom.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - bez prepoznavanja uzorka, koristi argument kao doslovan "
+"tekst.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sortiraj medije prema podstringovima razdvojenim "
+"zarezom.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ne ispisuj identične linije.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo medije za unaprjeđenje.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - rječiti mod.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ne razlikuj velika i mala slova u uzorcima.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - razlikuj velika i mala slova u uzorcima.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - promjena razdjelnika polja (standardno je ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Izrazi za uzorke:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - svaki tekst se tretira kao regexp, osim ako se koristi -"
+"I.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - uključi perl kod direktno kao perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binarni I operator.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binarni OR operator.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unarno NE.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - lijeva i desna zagrada.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Spisak tagova:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - određuje format izlaza nalik na printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   primjer: '%%ime:%%datoteke'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arhitektura\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - računar na kojem je kompajliran\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - vrijeme kompajliranja\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - konfiguracione datoteke\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - tagovi za konflikte\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - opis paketa\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribucija\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epoha\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - ime datoteke paketa\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - lista datoteka u paketu\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grupa\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - ime paketa\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - ime paketa\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - autor paketa\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - tag 'pruža'\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - tag 'zahtijeva'\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - veličina nakon instalacije\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - naziv izvornog rpm-a\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - sažetak.\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - URL\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - izdavač\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - medij na kojem je paket pronađen\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
+
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Izrazi za uzorke:\n"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "ispisujem list datoteku za medij \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2290,48 +2299,43 @@ msgstr ""
 "Greška: izgleda da je %s montiran samo za čitanje.\n"
 "Koristite opciju --allow-force za prinudnu operaciju."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Ažuriram medije...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (za ažuriranje)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (za ažuriranje)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (za instalaciju)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (za instalaciju)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Vaš izbor je? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2342,7 +2346,7 @@ msgstr ""
 "koji su stariji od instaliranih:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2353,7 +2357,7 @@ msgstr ""
 "koji su stariji od instaliranih:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2362,12 +2366,12 @@ msgstr ""
 "\n"
 "Svejedno nastavljate instalaciju?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2376,7 +2380,7 @@ msgstr ""
 "Neki od traženih paketa se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2385,12 +2389,12 @@ msgstr ""
 "Neki od traženih paketa se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će pokvariti vaš sistem"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2401,7 +2405,7 @@ msgstr ""
 "uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2412,12 +2416,12 @@ msgstr ""
 "uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(samo testiraj, uklanjanje neće biti izvršeno)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2427,7 +2431,7 @@ msgstr ""
 "Morate biti root da biste instalirali sljedeće ovisnosti:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2435,27 +2439,27 @@ msgstr[0] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 msgstr[1] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 msgstr[2] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(samo testiraj, instalacija neće biti izvršena)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, fuzzy, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2463,12 +2467,12 @@ msgstr[0] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 msgstr[1] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 msgstr[2] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pritisnite Enter kada budete spremni..."
@@ -2913,12 +2917,12 @@ msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Samo administrator (superkorisnik) može ažurirati medije"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ništa za update (koristite urpmi.addmedia da dodate medij)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2927,17 +2931,17 @@ msgstr ""
 "stavka za update nedostaje\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorišem medij %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "uključujem medij %s"
@@ -3216,6 +3220,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nije pronađen changelog\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Ažuriram medije...\n"
+
 #, fuzzy
 #~ msgid "examining %s file"
 #~ msgstr "ispitujem MD5SUM datoteku"
diff --git a/po/ca.po b/po/ca.po
index 3557b60c..2ca54b36 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-09-19 23:29+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -20,22 +20,22 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Instal·lació de RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_D'acord"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "Què voleu fer?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -72,7 +72,7 @@ msgstr ""
 "\n"
 "Voleu continuar?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -88,22 +88,22 @@ msgstr ""
 "\n"
 "Potser preferiu només desar-lo. Que voleu fer?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instal·lació"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Desa"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Escolliu la ubicació un desar el fitxer"
@@ -213,12 +213,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "No s'ha especificat cap paquet"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Si us plau, espereu..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "S'ha de ser root"
@@ -249,42 +249,42 @@ msgstr ""
 "%s\n"
 "Voleu continuar igualment?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Advertència"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (a actualitzar)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (a instal·lar)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Cal un dels paquets següents:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Avorta"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -295,56 +295,63 @@ msgstr ""
 "%s\n"
 "Voleu continuar igualment?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Per complir les dependències, s'instal·lara el següent paquet:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Per complir les dependències, s'instal·laran els paquets següents:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paquet, %d MB)"
 msgstr[1] "(%d paquets, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no es poden recuperar els paquets font. S'està interrompent"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "S'està preparant..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "S'està descarregant el paquet `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...ha fallat la recuperació: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Fet"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -356,28 +363,27 @@ msgstr ""
 "%s\n"
 "Potser voleu actualitzar la base de dades urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "La instal·lació ha fallat:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Ja està tot instal·lat"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instal·lació finalitzada"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "s'està eliminant %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "s'esta reiniciant urpmi"
@@ -451,58 +457,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "no s'ha pogut obrir rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "el nom del fitxer rpm és incorrecte [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "s'està recuperant els fitxer rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...recuperació feta"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ha fallat la recuperació: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "no s'ha pogut registrar el fitxer rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "error registrant els paquets locals"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -542,22 +542,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -650,84 +650,89 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "la còpia ha fallat"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "degut a que falten %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "degut a que falten %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "degut a que falten %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "s'està eliminant %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...ha fallat la recuperació: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "el protocol definit per a %s és desconegut"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 "no s'ha trobat cap programa per baixar coses de la xarxa, els programes "
 "suportats són: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "incapaç de gestionar el protocol: %s"
@@ -747,12 +752,12 @@ msgstr "no s'ha trobat el paquet %s."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "s'està recuperant els fitxers rpm de la font \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -760,47 +765,47 @@ msgstr ""
 "s'ha creat una transacció per instal·lar a %s (elimina=%d, instal·la=%d, "
 "actualitza=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "no s'ha pogut crear la transacció"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "no s'ha pogut eliminar el paquet %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "no s'ha pogut instal·lar el paquet %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "s'està instal·lant %s des de %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...ha fallat la recuperació: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "s'està eliminant el paquet %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "s'està eliminant el paquet %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "s'està instal·lant %s des de %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Més informació en quant el paquet %s"
@@ -845,76 +850,81 @@ msgstr "Advertència"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "La instal·lació ha fallat:"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Els paquets següents tenen signatures incorrectes"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Els paquets següents tenen signatures incorrectes"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Voleu continuar la instal·lació ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "s'està instal·lant %s des de %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "s'està distribuint %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "s'està instal·lant %s des de %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "s'està instal·lant %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr ""
 "Voleu intentar la instal·lació sense comprovar les dependències? (s/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "La instal·lació és possible"
@@ -1120,7 +1130,7 @@ msgstr "la còpia de [%s] ha fallat (el fitxer és sospitosament petit)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "s'està computant el md5sum de la font hdlist (o síntesi) recuperada"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "la còpia de [%s] ha fallat (el md5sum no concorda)"
@@ -1160,32 +1170,32 @@ msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "s'està recuperant el hdlist font (o la síntesi) de \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "s'està examinant el fitxer de clau pública de \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...s'ha importat la clau %s del fitxer de clau pública de \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no s'ha pogut importat el fitxer de clau pública de \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "s'ha afegit la font %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1200,94 +1210,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "s'està llegint els fitxers rpm des de [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Elecció incorrecta, torneu-ho a provar\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Cerca"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "s'està esborrant la font \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1370,309 +1385,6 @@ msgstr "s'està muntant %s"
 msgid "unmounting %s"
 msgstr "s'està desmuntant %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf versió %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
-"GNU.\n"
-"\n"
-"sintaxi: urpmf [opcions] patró-expressió\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - mostra la informació de la versió.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - utilitza un entorn concret (normalment un\n"
-"                   informe d'errors).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - no usis les fonts donades, separades per comes.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - usa una altre arrel per la instal·lació de rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia        - ordena les fonts segons les cadenes donades, s'han de "
-"separar amb comes.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - no imprimeix línies idèntiques.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - utilitza només les fonts d'actualització.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose             - mode detallat.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignora les distincions de majúscules en els patrons.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - ignora les distincions de majúscules en els patrons.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operador binari AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operador binari OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NOT unari.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  ( )            - parentesis esquerre i dret per expressions de grup.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Llista de etiquetes:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - utilitza l'interfície X.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   exemple: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - mostra l'etiqueta url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - màquina de construcció.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Mòdul de configuració de la consola"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-"  --conflicts     - mostra l'etiqueta conflicts: tots els conflictes.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - mostra la descripció.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - mostra l'etiqueta epoch: època.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name           - imprimeix només els noms dels paquets.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - llista els fitxers del paquet.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - mostra el grup del paquet.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name           - imprimeix només els noms dels paquets.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name           - imprimeix només els noms dels paquets.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-"  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
-"obsolets.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - empaquetador.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-"  --provides      - mostra l'etiqueta provides: tots allò que proporciona.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-"  --requires      - mostra l'etiqueta requires: tots allò que necessita.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - mostra l'etiqueta size: mida.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-"  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
-"obsolets.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - imprimeix el resum.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - mostra l'etiqueta url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -verbose             - mode detallat.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - llista els fitxers del paquet.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - mostra la versió, llançament i arquitectura amb el nom.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "s'està escrivint el fitxer list per la font \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1689,7 +1401,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "No hi cap paquet anomenat %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Els paquets següents contenen %s: %s"
@@ -1699,47 +1411,47 @@ msgstr "Els paquets següents contenen %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Ja està tot instal·lat"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Ja està tot instal·lat"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Ja està tot instal·lat"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "degut a que falten %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Ja està tot instal·lat"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "degut a %s no satisfetes"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "Res a eliminar"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "per tal de mantenir %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1748,7 +1460,7 @@ msgstr ""
 "El paquets següent s'ha d'eliminar per poder actualitzar uns altres:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1757,12 +1469,12 @@ msgstr ""
 "Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "per tal d'instal·lar %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "degut a conflictes amb %s"
@@ -1855,6 +1567,12 @@ msgstr "  --packager     - mostra l'etiqueta packager: empaquetador.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usa una altre arrel per l'eliminació de rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - usa una altre arrel per la instal·lació de rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1884,39 +1602,39 @@ msgstr ""
 "  -a             - selecciona tots els paquets que coincideixen amb "
 "l'expressió.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "El superusuari és l'únic autoritzat per a eliminar paquets"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "paquets desconeguts"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "paquet desconegut"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "eliminar el paquet %s trencarà el vostre sistema"
 msgstr[1] "eliminar el paquet %s trencarà el vostre sistema"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Res a eliminar"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Res a eliminar"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1925,45 +1643,336 @@ msgstr[0] "Per a complir les dependències, s'eliminara el següent paquet"
 msgstr[1] ""
 "Per a complir les dependències, s'eliminaran els següents %d paquets"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "paquet desconegut"
 msgstr[1] "paquet desconegut"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Elimina %d paquet?"
 msgstr[1] "Elimina %d paquets?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "agafant dispositiu extraïble com a \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "L'eliminació ha fallat"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "L'eliminació ha fallat"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf versió %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU.\n"
+"\n"
+"sintaxi: urpmf [opcions] patró-expressió\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - mostra la informació de la versió.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - utilitza un entorn concret (normalment un\n"
+"                   informe d'errors).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - no usis les fonts donades, separades per comes.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia        - ordena les fonts segons les cadenes donades, s'han de "
+"separar amb comes.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - no imprimeix línies idèntiques.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - utilitza només les fonts d'actualització.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose             - mode detallat.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignora les distincions de majúscules en els patrons.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - ignora les distincions de majúscules en els patrons.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operador binari AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operador binari OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NOT unari.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  ( )            - parentesis esquerre i dret per expressions de grup.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Llista de etiquetes:\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - utilitza l'interfície X.\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   exemple: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - mostra l'etiqueta url: url.\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - màquina de construcció.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Mòdul de configuració de la consola"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+"  --conflicts     - mostra l'etiqueta conflicts: tots els conflictes.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - mostra la descripció.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - mostra l'etiqueta epoch: època.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name           - imprimeix només els noms dels paquets.\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - llista els fitxers del paquet.\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - mostra el grup del paquet.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name           - imprimeix només els noms dels paquets.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name           - imprimeix només els noms dels paquets.\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+"  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
+"obsolets.\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - empaquetador.\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+"  --provides      - mostra l'etiqueta provides: tots allò que proporciona.\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+"  --requires      - mostra l'etiqueta requires: tots allò que necessita.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - mostra l'etiqueta size: mida.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+"  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
+"obsolets.\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - imprimeix el resum.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - mostra l'etiqueta url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -verbose             - mode detallat.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - llista els fitxers del paquet.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - mostra la versió, llançament i arquitectura amb el nom.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "s'està escrivint el fitxer list per la font \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2317,48 +2326,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (a actualitzar)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (a actualitzar)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (a instal·lar)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (a instal·lar)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Per a complir les dependències, s'eliminara el següent paquet"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Quina és la vostra elecció? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2366,7 +2370,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2374,19 +2378,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Voleu continuar igualment?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2395,7 +2399,7 @@ msgstr ""
 "Alguns dels paquets demanats no es poden instal·lar:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2404,12 +2408,12 @@ msgstr ""
 "Alguns dels paquets demanats no es poden instal·lar:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "eliminar el paquet %s trencarà el vostre sistema"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2420,7 +2424,7 @@ msgstr ""
 "s'ha d'eliminar per poder actualitzar uns altres:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2431,12 +2435,12 @@ msgstr ""
 "s'han d'eliminar per poder actualitzar uns altres:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2446,7 +2450,7 @@ msgstr ""
 "Es necessita ser 'root' per a instal·lar les següents dependències:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2454,39 +2458,39 @@ msgstr[0] "Per a complir les dependències, s'eliminara el següent paquet"
 msgstr[1] ""
 "Per a complir les dependències, s'eliminaran els següents %d paquets"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, fuzzy, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "No s'han pogut instal·lar els paquets (%s)!"
 msgstr[1] "No s'han pogut instal·lar els paquets (%s)!"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Premeu Intro quan estigui fet..."
@@ -2925,13 +2929,13 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "El superusuari és l'únic autoritzat per a actualitzar fonts"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir una font)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2940,17 +2944,17 @@ msgstr ""
 "falta l'entrada per actualitzar\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "s'està ignorant la font %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "s'està habilitant la font %s"
diff --git a/po/cs.po b/po/cs.po
index 258e3925..4b7d69ba 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-07 21:50+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -21,24 +21,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Instalace RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Chyba: nelze nalézt soubor %s, operace bude zrušena"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -60,7 +61,7 @@ msgstr ""
 "\n"
 "Jak chcete pokračovat?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -75,7 +76,7 @@ msgstr ""
 "\n"
 "Pokračovat?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -90,22 +91,22 @@ msgstr ""
 "\n"
 "Možná chcete tento balíček pouze uložit. Jak chcete pokračovat?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instalovat"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Uložit"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Přerušit"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Vyberte, kam chcete uložit soubor"
@@ -149,13 +150,17 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - spustí program i v případě, že některé balíčky chybí.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - spustí program i v případě, že některé balíčky chybí.\n"
 
 #: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
@@ -184,18 +189,21 @@ msgstr "  -P             - nehledá balíček v položkách provides.\n"
 #: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
+msgstr ""
+"  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
 
 #: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
-msgstr "  --test         - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
+msgstr ""
+"  --test         - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - použít pouze zadané zdroje pro vyhledávání požadovaných "
 "balíčků.\n"
@@ -205,12 +213,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Nebyly zadány žádné balíčky"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Čekejte prosím..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Nutný root"
@@ -241,42 +249,42 @@ msgstr ""
 "%s\n"
 "Pokračovat i přesto v instalaci?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Varování"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (k aktualizaci)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (k instalaci)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Výběr balíčků"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Je zapotřebí jeden z následujících balíčků:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Přerušit"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -287,17 +295,19 @@ msgstr ""
 "%s\n"
 "Pokračovat i přesto v instalaci?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Aby byly splněny závislosti, bude nainstalován následující balíček"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Aby byly splněny závislosti, budou nainstalovány následující balíčky"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -305,37 +315,44 @@ msgstr[0] "(%d balíček, %d MB)"
 msgstr[1] "(%d balíčky, %d MB)"
 msgstr[2] "(%d balíčků, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nelze získat zdrojový balíček, končím"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Připravuji..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaluji balíček `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Prosím vložte médium nazvané \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Stahuje se balíček `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...načítání selhalo: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Hotovo"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -346,28 +363,27 @@ msgstr ""
 "%s\n"
 "Možná potřebujete aktualizovat vaši databázi urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalace selhala:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "vše je již nainstalováno"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalace dokončena"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "odstraňuje se %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartuji urpmi"
@@ -441,58 +457,52 @@ msgstr "složka prostředí %s neexistuje"
 msgid "using specific environment on %s\n"
 msgstr "používá se specifické prostředí na %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "nelze otevřít databázi rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "neplatný název rpm souboru [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "načítám rpm soubor [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...načítání ukončeno"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...načítání selhalo: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nelze zpřístupnit rpm soubor [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "nelze zpracovat soubor SPEC %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "nelze registrovat rpm soubor"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Nekompatibilní architektura pro rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "chyba při registraci lokálních balíčků"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Tato operace je zakázána při běhu v omezeném režimu"
@@ -532,22 +542,22 @@ msgstr "chybí výraz pro zavření"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "urpmf očekává implicitně regulární výraz, použijte volbu \"--literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "adresář chroot neexistuje"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Nelze použít %s bez %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Nelze použít %s zároveň s %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Příliš mnoho parametrů\n"
@@ -641,82 +651,87 @@ msgstr "%s selhal: skončil se signálem %d"
 msgid "%s failed: exited with %d"
 msgstr "%s selhal: skončil s výsledkem %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "kopírování selhalo"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "chybí wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "chybí curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl selhal: stahování bylo přerušeno\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "chybí rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "chybí ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "chybí prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Nelze spustit aplikaci prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "chybí aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% z %s hotovo, ETA = %s, rychlost = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% hotovo, rychlost = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "přijímám %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "přijato %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "neznámý protokol definovaný pro %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nebyla nalezena aplikace pro stažení přes web, podporované jsou: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nelze zpracovat protokol: %s"
@@ -736,59 +751,60 @@ msgstr "balíček %s nenalezen."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "načítám rpm soubory ze zdroje \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[přebaluje se]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "vytvořena transakce pro instalaci na %s (odstranění=%d, instalace=%d, "
 "aktualizace=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "nelze vytvořit transakci"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "nelze extrahovat rpm z delta-rpm balíčku %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "nelze nainstalovat balíček %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "odstraňují se vadné balíčky rpm (%s) z %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "odstranění %s selhalo: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Odstraňuje se balíček %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "odstraňuje se balíček %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "odstraňují se instalované balíčky rpm (%s) z %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Více informací o balíčku %s"
@@ -833,18 +849,23 @@ msgstr "přerušuji"
 msgid "%s database is locked (another program is already using it)"
 msgstr "Databáze %s je zamčená (už ji používá jiný program)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Chyba při instalaci"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Přesto zkusit pokračovat? (a/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -853,57 +874,57 @@ msgstr ""
 "Instalace selhala, vadné balíčky rpm:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Následující balíček má špatnou signaturu"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Následující balíčky mají špatné signatury"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Chcete pokračovat v instalaci?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "odstraňují se instalované balíčky rpm (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuuji %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "instaluji %s z %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instaluji %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Balíčky jsou aktuální"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalace je možná"
@@ -911,7 +932,8 @@ msgstr "Instalace je možná"
 #: ../urpm/md5sum.pm:26
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
-msgstr "varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
+msgstr ""
+"varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
 
 #: ../urpm/media.pm:204
 #, c-format
@@ -1107,7 +1129,7 @@ msgstr "kopírování [%s] selhalo (soubor je podezřele malý)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "počítám součet md5 získaného zdrojového souboru se syntézou"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "načtení [%s] selhalo (chyba v kontrolním součtu md5sum)"
@@ -1147,32 +1169,32 @@ msgstr "pro zdroj \"%s\" nebyla nalezena žádná metadata"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "načítám zdrojový soubor se syntézou pro \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "zkoumá se soubor s veřejnými klíči \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importuji klíč %s ze souboru veřejných klíčů \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nelze importovat soubor s veřejnými klíči \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nebyl nalezen soubor se syntézou pro zdroj \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "aktualizován zdroj \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "načtení [%s] selhalo"
@@ -1187,94 +1209,99 @@ msgstr "zkouším znovu se zrcadlem %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Nelze nalézt zrcadlo ze seznamu zrcadel %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "nalezena geolokalizace %s %.2f %.2f z časové zóny %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "získává se seznam zrcadel z %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "AaYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (a/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Je mi líto, to je špatná volba. Zkuste to znovu\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Balíček"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Verze"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Vydání"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arch."
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(navrhováno)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "zdroj \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "příkazový řádek"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1366,298 +1393,6 @@ msgstr "připojuji %s"
 msgid "unmounting %s"
 msgstr "odpojuji %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf verze %s\n"
-"Copyright ©2002-2006 Mandriva.\n"
-"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
-"GPL.\n"
-"\n"
-"použití: urpmf [volby] vzor-výraz\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - vypíše číslo verze tohoto nástroje.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - použij specifické prostředí (většinou hlášení o chybě).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - neporovnávat vzory, použije se parametr jako prostý "
-"řetězec.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - použít jiný kořenový adresář pro instalaci balíčků rpm a "
-"databázi urpmi.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - třídit zdroje podle podřetězců oddělených čárkami.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - použít zadanou cestu pro přístup ke zdroji\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - nevytiskne stejné řádky.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - užvaněný režim.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - ve vzorech se bere ohled na malá a velká písmena "
-"(výchozí).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - změní oddělovač pole (běžně na ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "vzorek výrazů:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - každ text je brán jako regulerní výraz, pokud není zadáno "
-"-l.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - vloží kód Perl přímo jako perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binární operátor AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binární operátor OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unární operátor NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - levá a pravá závorka.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Seznam značek (tagů):\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - udává výstupní formát podle příkazu printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   příklad: '%%název:%%soubory'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - architektura\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - sestavovací počítač\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - doba sestavení ze zdrojových kódů\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - soubory s nastavením\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - tag s konflikty\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - popis balíčku\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribuce\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epocha\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - název souboru balíčku\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - seznam souborů obsažených v balíčku\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - skupina\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licence\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - název balíčku\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - co se nahrazuje (dělá zastaralým)\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - kdo vytvořil balíček\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - co se poskytuje\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - co se požaduje\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - instalovaná velikost\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - název zdrojového balíčku rpm\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - doporučené (navrhované) balíčky\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - shrnutí\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - dodavatel\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - zdroj, ve kterém byl balíček nalezen\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - společně se jménem vypíše verzi, vydání a architekturu.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Nesprávný formát: můžete použít pouze jeden vícehodnotový tag"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "není k dispozici žádný soubor hdlist pro zdroj \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "není k dispozici žádný soubor se syntézou pro zdroj \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "není k dispozici žádné xml-info pro zdroj \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1665,15 +1400,17 @@ msgstr "urpmi bylo znovu spuštěno a seznam prioritních balíčků se nezměni
 
 #: ../urpm/select.pm:32
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi bylo znovu spuštěno a seznam prioritních balíčků se změnil: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi bylo znovu spuštěno a seznam prioritních balíčků se změnil: %s vs %s"
 
 #: ../urpm/select.pm:170
 #, c-format
 msgid "No package named %s"
 msgstr "Žádný balíček s názvem %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Následující balíčky obsahují: %s: %s"
@@ -1683,47 +1420,47 @@ msgstr "Následující balíčky obsahují: %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Chcete-li použít všechny, použijte volbu \"-a\""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "nalezeny balíčky %s v db urpmi, ale žádný není instalovaný"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Balíček %s je již nainstalován"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Balíčky %s jsou již nainstalovány"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "z důvodu chybějícího %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "díky již nainstalovanému %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "z důvodu nesplněného %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokouším se postoupit %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "aby bylo možné zachovat %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1732,7 +1469,7 @@ msgstr ""
 "Následující balíček musí být odstraněn, aby bylo možné jiné aktualizovat:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1741,12 +1478,12 @@ msgstr ""
 "Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "pro instalaci %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "z důvodu konfliktů s %s"
@@ -1821,12 +1558,14 @@ msgstr "  --auto-orphans - odstraní sirotky\n"
 #: ../urpme:49
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - zkontrolovat, zda lze dokončit odstranění správně.\n"
+msgstr ""
+"  --test         - zkontrolovat, zda lze dokončit odstranění správně.\n"
 
 #: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
+msgstr ""
+"  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
 
 #: ../urpme:52 ../urpmi:142
 #, c-format
@@ -1836,12 +1575,22 @@ msgstr "  --repackage    - Před smazáním znovu zabalí soubory\n"
 #: ../urpme:53
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - použít pro odebrání balíčků jiný kořenový adresář.\n"
+msgstr ""
+"  --root         - použít pro odebrání balíčků jiný kořenový adresář.\n"
+
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - použít jiný kořenový adresář pro instalaci balíčků rpm a "
+"databázi urpmi.\n"
 
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - aktualizovat pouze databázi RPM, ne souborový systém.\n"
+msgstr ""
+"  --justdb       - aktualizovat pouze databázi RPM, ne souborový systém.\n"
 
 #: ../urpme:56
 #, c-format
@@ -1867,22 +1616,22 @@ msgstr "  --verbose, -v  - užvaněný režim.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vybere všechny balíčky vyhovující výrazu.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Odstranit balíčky může pouze uživatel root"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "neznámé balíčky"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "neznámý balíček"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1890,25 +1639,26 @@ msgstr[0] "Odebrání následujícího balíčku naruší funkčnost vašeho sys
 msgstr[1] "Odebrání následujících balíčků naruší funkčnost vašeho systému:"
 msgstr[2] "Odebrání následujících balíčků naruší funkčnost vašeho systému:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Není co odebrat"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Nejsou sirotci k odebrání"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "Aby byly splněny závislosti, bude odebrán %d balíček"
 msgstr[1] "Aby byly splněny závislosti, budou odebrány %d balíčky"
 msgstr[2] "Aby byly splněny závislosti, bude odebráno %d balíčků"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1916,7 +1666,7 @@ msgstr[0] "(sirotčí balíček)"
 msgstr[1] "(sirotčí balíčky)"
 msgstr[2] "(sirotčí balíčky)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1924,35 +1674,320 @@ msgstr[0] "Odstranit %d balíček?"
 msgstr[1] "Odstranit %d balíčky?"
 msgstr[2] "Odstranit %d balíčků?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (a/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "testuji odstranění %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Odebírání selhalo"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Odstranění je možné"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf verze %s\n"
+"Copyright ©2002-2006 Mandriva.\n"
+"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
+"GPL.\n"
+"\n"
+"použití: urpmf [volby] vzor-výraz\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - vypíše číslo verze tohoto nástroje.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - použij specifické prostředí (většinou hlášení o chybě).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - neporovnávat vzory, použije se parametr jako prostý "
+"řetězec.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - třídit zdroje podle podřetězců oddělených čárkami.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - použít zadanou cestu pro přístup ke zdroji\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - nevytiskne stejné řádky.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - užvaněný režim.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - ve vzorech se bere ohled na malá a velká písmena "
+"(výchozí).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - změní oddělovač pole (běžně na ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "vzorek výrazů:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - každ text je brán jako regulerní výraz, pokud není zadáno "
+"-l.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - vloží kód Perl přímo jako perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binární operátor AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binární operátor OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unární operátor NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - levá a pravá závorka.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Seznam značek (tagů):\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - udává výstupní formát podle příkazu printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   příklad: '%%název:%%soubory'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - architektura\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - sestavovací počítač\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - doba sestavení ze zdrojových kódů\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - soubory s nastavením\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - tag s konflikty\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - popis balíčku\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribuce\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epocha\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - název souboru balíčku\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - seznam souborů obsažených v balíčku\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - skupina\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licence\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - název balíčku\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - co se nahrazuje (dělá zastaralým)\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - kdo vytvořil balíček\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - co se poskytuje\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - co se požaduje\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - instalovaná velikost\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - název zdrojového balíčku rpm\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - doporučené (navrhované) balíčky\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - shrnutí\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - URL\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - dodavatel\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - zdroj, ve kterém byl balíček nalezen\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - společně se jménem vypíše verzi, vydání a architekturu.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "neukončený výraz (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Nesprávný formát: můžete použít pouze jeden vícehodnotový tag"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "není k dispozici žádný soubor hdlist pro zdroj \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "není k dispozici žádný soubor se syntézou pro zdroj \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "není k dispozici žádné xml-info pro zdroj \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
-msgstr "  --auto-update  - provede aktualizaci zdrojů a poté aktualizaci systému.\n"
+msgstr ""
+"  --auto-update  - provede aktualizaci zdrojů a poté aktualizaci systému.\n"
 
 #: ../urpmi:82
 #, c-format
@@ -2035,7 +2070,8 @@ msgstr ""
 #: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
+msgstr ""
+"  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
 
 #: ../urpmi:100
 #, c-format
@@ -2044,8 +2080,10 @@ msgstr "  --noclean      - neodstraňovat rpm balíčky z vyrovnávací paměti.
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - vynutit instalaci balíčků, které jsou již nainstalovány.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - vynutit instalaci balíčků, které jsou již nainstalovány.\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2216,7 +2254,8 @@ msgstr "  --nolock       - nezamkne se databáze balíčků RPM.\n"
 #: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - aktualizovat pouze balíčky se shodnou architekturou.\n"
+msgstr ""
+"  --strict-arch  - aktualizovat pouze balíčky se shodnou architekturou.\n"
 
 #: ../urpmi:149 ../urpmq:97
 #, c-format
@@ -2236,7 +2275,8 @@ msgstr "  --debug        - velmi užvaněný režim.\n"
 #: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
+msgstr ""
+"  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
 
 #: ../urpmi:183
 #, c-format
@@ -2269,7 +2309,8 @@ msgstr "použije se --buildrequires"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "použijte prosím --buildrequires nebo --install-src, použije se --"
 "buildrequires"
@@ -2297,48 +2338,44 @@ msgstr ""
 "Chyba: %s vypadá, že je připojen pouze ke čtení.\n"
 "Použijte --allow-force, chcete-li operaci provést."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Obnovuji media...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (k aktualizaci)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (k aktualizaci)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (k instalaci)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (k instalaci)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
-msgstr "Aby byly splněna závislost '%s', je třeba jeden z následujících balíčků:"
+msgstr ""
+"Aby byly splněna závislost '%s', je třeba jeden z následujících balíčků:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Jaká je vaše volba? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2349,7 +2386,7 @@ msgstr ""
 "které jsou starší než instalovaná verze:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2360,7 +2397,7 @@ msgstr ""
 "které jsou starší než instalovaná verze:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2369,12 +2406,12 @@ msgstr ""
 "\n"
 "Přesto pokračovat v instalaci?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (A/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2383,7 +2420,7 @@ msgstr ""
 "Požadovaný balíček nelze nainstalovat:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2392,12 +2429,12 @@ msgstr ""
 "Některé požadované balíčky nebylo možné nainstalovat:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "odebrání balíčku %s naruší funkčnost vašeho systému"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2408,7 +2445,7 @@ msgstr ""
 "být odstraněn, aby bylo možné jiné aktualizovat:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2419,12 +2456,12 @@ msgstr ""
 "být odstraněny, aby bylo možné jiné aktualizovat:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(pouze test, k odstranění ve skutečnosti nedojde)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2435,7 +2472,7 @@ msgstr ""
 "následující závislosti:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2443,27 +2480,27 @@ msgstr[0] "Bude odstraněn následující sirotek."
 msgstr[1] "Budou odstraněni následující sirotci."
 msgstr[2] "Budou odstraněni následující sirotci."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(pouze test, k instalaci ve skutečnosti nedojde)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Bude použito %s dodatečného diskového prostoru."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Bude uvolněno %s diskového prostoru."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Bude staženo %s balíčků."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2471,12 +2508,12 @@ msgstr[0] "Pokračovat v instalaci %d balíčku?"
 msgstr[1] "Pokračovat v instalaci %d balíčků?"
 msgstr[2] "Pokračovat v instalaci %d balíčků?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Stiskněte Enter po připojení..."
@@ -2594,7 +2631,8 @@ msgstr ""
 #: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  - spolu s --distrib se zeptá na potvrzení u každého zdroje\n"
+msgstr ""
+"  --interactive  - spolu s --distrib se zeptá na potvrzení u každého zdroje\n"
 
 #: ../urpmi.addmedia:76
 #, c-format
@@ -2613,7 +2651,8 @@ msgstr ""
 #: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
-msgstr "  --virtual      - vytvoří virtuální zdroje, které jsou vždy aktuální.\n"
+msgstr ""
+"  --virtual      - vytvoří virtuální zdroje, které jsou vždy aktuální.\n"
 
 #: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
@@ -2728,7 +2767,8 @@ msgstr "  --noclean      - nečistit na kontrolním bodu sestavovací adresář\
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr "  --list         - vypíše transakce od daného data/doby\n"
 
 #: ../urpmi.recover:38
@@ -2930,12 +2970,12 @@ msgstr "  -ff            - opravdu vynutí aktualizaci souborů syntézy\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Aktualizovat zdroj může pouze uživatel root"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nic k aktualizaci (použijte urpmi.addmedia pro přidání zdroje)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2944,17 +2984,17 @@ msgstr ""
 "záznam pro update chybí\n"
 "(jeden z %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignoruji zdroj %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "zapínám zdroj %s"
@@ -3024,8 +3064,10 @@ msgstr "  --list-aliases - seznam dostupných paralelních přezdívek.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
 
 #: ../urpmq:64
 #, c-format
@@ -3034,7 +3076,8 @@ msgstr "  --src          - další balíček je zdrojový (stejné jako -s).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources     - všechny zdrojové balíčky před stažením (pouze uživatel "
 "root).\n"
@@ -3042,7 +3085,8 @@ msgstr ""
 #: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - povolí dotazy na balíčky RPM pro jiné architektury.\n"
+msgstr ""
+"  --ignorearch   - povolí dotazy na balíčky RPM pro jiné architektury.\n"
 
 #: ../urpmq:71
 #, c-format
@@ -3139,7 +3183,8 @@ msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
+msgstr ""
+"  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3166,7 +3211,8 @@ msgstr "  -s              - další balíček je zdrojový (stejné jako --src).
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
-msgstr "  -u             - odebere balíček pokud je již instalována novější verze.\n"
+msgstr ""
+"  -u             - odebere balíček pokud je již instalována novější verze.\n"
 
 #: ../urpmq:107
 #, c-format
@@ -3181,7 +3227,8 @@ msgstr "  -Y             - jako -y, ale ignoruje velká a malá písmena.\n"
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
+msgstr ""
+"  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3201,7 +3248,8 @@ msgstr "použijte -l pro seznam souborů"
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "pro zdroj \"%s\" neexistuje xml info, pouze částečný výsledek pro balíček %s"
+msgstr ""
+"pro zdroj \"%s\" neexistuje xml info, pouze částečný výsledek pro balíček %s"
 
 #: ../urpmq:405
 #, c-format
@@ -3212,14 +3260,16 @@ msgstr ""
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
 "balíček %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
 "balíčky %s"
@@ -3229,3 +3279,5 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nebyl nalezen záznam změn\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Obnovuji media...\n"
diff --git a/po/cy.po b/po/cy.po
index 317b0528..07b211f4 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-07 18:50-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Gosod RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "Beth hoffech chi ei wneud?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -86,22 +86,22 @@ msgstr ""
 "\n"
 "Efallai byddai'n well gennych ei gadw. Beth yw eich dewis?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Gosod"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Dewiswch leoliad i gadw'r ffeil"
@@ -205,12 +205,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Heb enwi pecyn"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Arhoswch..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Rhaid bod yn root"
@@ -241,42 +241,42 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -287,56 +287,63 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pecyn, %d MB)"
 msgstr[1] "(%d pecyn, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... methodd ail-lwytho: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -347,28 +354,27 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -442,58 +448,52 @@ msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... methodd ail-lwytho: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "methu didoli ffeil spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
@@ -535,22 +535,22 @@ msgstr ""
 "drwy ragosodiad mae urmpf yn disgwyl regexp, dylech ddefnyddio dewis  \"--"
 "literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
@@ -644,82 +644,87 @@ msgstr "Methodd '%s': gadael gydag arwydd %d"
 msgid "%s failed: exited with %d"
 msgstr "Methodd '%s': gadael gyda %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "methodd y copïo"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "mae wget ar goll\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "mae curl ar goll\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "methodd curl: diddymwyd y llwytho i lawr\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync ar goll\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh ar goll\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla ar goll\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Methu gweithredu prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 ar goll\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% o %s wedi ei gwblhau, Amser = %s, cyflymder = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% wedi ei gwblhau, cyflymder = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "estyn %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "estynwyd: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
@@ -739,59 +744,59 @@ msgstr "heb ganfod pecyn %s"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[ailbecynnu]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "tynnu rpm gwallus (%s) o %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "tynnu %s methodd: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Tynnu pecyn %s."
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tynnu rpm wedi eu gosod (%s) o %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -836,18 +841,23 @@ msgstr "atal"
 msgid "%s database is locked (another program is already using it)"
 msgstr "Mae cronfa ddata %s wedi ei chloi (mae rhaglen arall yn ei defnyddio)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Ceisio mynd ymlaen beth bynnag? (i/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -856,57 +866,57 @@ msgstr ""
 "Methodd y gosod, rpm gwallus:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Mae gan y pecyn canlynol lofnod gwallus"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "tynnu rpm wedi eu gosod (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Mae'r pecynnau'n rhai diweddaraf"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
@@ -1111,7 +1121,7 @@ msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "cyfrifo md5sum o ffynhonnell synthesis adferwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "methodd estyn (%s) (md5sum gwallus)"
@@ -1151,32 +1161,32 @@ msgstr "dim metadata ar gyfer cyfrwng \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "adfer ffynhonnell synthesis \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "methodd estyn [%s]"
@@ -1191,17 +1201,17 @@ msgstr "ceisio eto gyda drych %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Methu canfod drych o restr drychau %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "wedi canfod geolleoleiddio %s %.2f %.2f  o gylchfa amser %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "estyn rhestr drychai o %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1211,78 +1221,83 @@ msgstr "Nn"
 #  can hit those keys in their keyboard to reply.
 #  please keep the 'Yy' for compatibility reasons
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pecyn"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Fersiwn"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Ryddhad"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arch"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(awgrym)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "cyfrwng \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "llinell orchymyn"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1371,306 +1386,6 @@ msgstr "gosod %s"
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf fersiwn %s\n"
-"Hawlfraint © 2002 - 2006 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU..\n"
-"\n"
-"defnydd: urpmf [dewisiadau] pattern-expression\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
-"rheol).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
-"llythrennedd.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac "
-"rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
-"choma.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --use-distrib  - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modd llafar.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
-"(rhagosodiad).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - newid ymwahanydd maes (arferol i ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Mynegiadau patrymau:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
-"yn cael ei ddefnyddio.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - gweithredwr deuaidd AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - gweithredwr deuaidd OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unaidd NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )              - parenthesis de a chwith.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Rhestr tagiau:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - pennu allbwn fformat printf-aidd\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   esiampl: '%%enw:%%ffeil'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - saernïaeth\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - gwestai'r adeiladedd\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - amser adeiladu\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - tagiau gwrthdaro\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - disgrifiad pecyn\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - dosbarthiad\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - cyfnod\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - enw ffeil y pecyn\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - rhestr ffeiliau o fewn y pecyn\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grŵp\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license          - trwydded\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name          - enw'r pecyn\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - tagiau'r hen\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager      - pecynydd\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - tag darparu\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - tagiau angenrhaid\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - maint wedi gosod\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - cynnig tagiau\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - crynodeb\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - gwerthwr\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1688,7 +1403,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Dim pecyn o'r enw %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
@@ -1698,47 +1413,47 @@ msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Dylech ddefnyddio \"-a\" i'w defnyddio i gyd"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "wedi canfod pecyn(nau) %s yn urpmi db, ond heb eu gosod"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pecyn %s wedi ei osod eisoes"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pecynnau %s wedi eu gosod eisoes"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "oherwydd %s wedi ei osod eisoes"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1747,7 +1462,7 @@ msgstr ""
 "Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1756,12 +1471,12 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
@@ -1853,6 +1568,14 @@ msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac "
+"rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1882,39 +1605,39 @@ msgstr "  --verbose, -v  - modd llafar.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pecynnau anhysbys"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Bydd tynnu pecyn canlynol yn torri eich system:"
 msgstr[1] "Bydd tynnu pecynnau canlynol yn torri eich system:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Dim i'w dynnu"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Dim amddifad i'w tynnu"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1922,45 +1645,331 @@ msgid_plural ""
 msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
 msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "pecyn amddifad"
 msgstr[1] "pecynnau amddifad"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu pecynnau %d?"
 msgstr[1] "Tynnu pecynnau %d?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "profi tynnu %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Methodd y tynnu"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Mae tynnu yn bosibl"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf fersiwn %s\n"
+"Hawlfraint © 2002 - 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU..\n"
+"\n"
+"defnydd: urpmf [dewisiadau] pattern-expression\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
+"rheol).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
+"llythrennedd.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
+"choma.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --use-distrib  - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modd llafar.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
+"(rhagosodiad).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - newid ymwahanydd maes (arferol i ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Mynegiadau patrymau:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
+"yn cael ei ddefnyddio.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - gweithredwr deuaidd AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - gweithredwr deuaidd OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unaidd NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )              - parenthesis de a chwith.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Rhestr tagiau:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - pennu allbwn fformat printf-aidd\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   esiampl: '%%enw:%%ffeil'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - saernïaeth\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - gwestai'r adeiladedd\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - amser adeiladu\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - tagiau gwrthdaro\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - disgrifiad pecyn\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - dosbarthiad\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - cyfnod\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - enw ffeil y pecyn\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - rhestr ffeiliau o fewn y pecyn\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grŵp\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license          - trwydded\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - enw'r pecyn\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - tagiau'r hen\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager      - pecynydd\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - tag darparu\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - tagiau angenrhaid\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - maint wedi gosod\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - cynnig tagiau\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - crynodeb\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - gwerthwr\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "Mynegiadauheb ei derfynnu (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2312,48 +2321,43 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Diweddaru cyfrwng...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uwchraddio)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uwchraddio)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (gosod)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "I fodloni '%s' dibyniaeth, bydd angen un o'r pecynnau canlynol:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2364,7 +2368,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2375,7 +2379,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2384,12 +2388,12 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2398,7 +2402,7 @@ msgstr ""
 "Nid oes modd gosod pecyn gofynnwyd amdani:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2407,12 +2411,12 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2423,7 +2427,7 @@ msgstr ""
 "gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2434,12 +2438,12 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2450,46 +2454,46 @@ msgstr ""
 "canlynol:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Bydd y pecyn amddifad canlynol yn cael ei dynnu"
 msgstr[1] "Bydd y pecynnau amddifad canlynol yn cael eu tynnu"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Bydd %s o le ar ddisg ar gael."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "bydd %s o becynnau yn cael eu hadfer."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Parhau gyda gosod %d pecyn?"
 msgstr[1] "Parhau gyda gosod %d pecyn?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pwyso Enter pan wedi ei arosod..."
@@ -2949,12 +2953,12 @@ msgstr "  -f             - gorfodi diweddaru ffeiliau synthesis/\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2963,17 +2967,17 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "anwybyddu cyfrwng %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "galluogi cyfrwng %s"
@@ -3264,6 +3268,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Diweddaru cyfrwng...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "archwilio %s ffeil"
 
diff --git a/po/da.po b/po/da.po
index 88677bcc..5699ef84 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-11-03 15:19+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -27,22 +27,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-installering"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fejl: kunne ikke finde fil %s, vil afbryde handling"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_O.k."
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "Hvad ønsker du at gøre?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -79,7 +79,7 @@ msgstr ""
 "\n"
 "Fortsæt?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -94,22 +94,22 @@ msgstr ""
 "\n"
 "Du vil måske foretrække blot at gemme den. Hvad er dit valg?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Installér"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Gem"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Vælg sted at gemme filen"
@@ -152,13 +152,17 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - vælg automatisk pakker for opgradering af systemet.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - vælg automatisk pakker for opgradering af systemet.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - gennemfør kald selv om nogen pakker ikke eksisterer.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - gennemfør kald selv om nogen pakker ikke eksisterer.\n"
 
 #: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
@@ -199,7 +203,8 @@ msgstr "  --test         - afprøv kun om installationen kan udføres korrekt.\n
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - brug kun det opgivne medie for at søge efter de ønskede "
 "pakker.\n"
@@ -209,12 +214,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Ingen pakker angivet"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Vent venligst..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Skal være root"
@@ -245,42 +250,42 @@ msgstr ""
 "%s\n"
 "Skal installationen fortsættes alligevel?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "O.k."
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (skal opgraderes)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (skal installeres)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Pakkevalg"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Der er brug for en af de følgende pakker:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Afbryd"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -291,54 +296,65 @@ msgstr ""
 "%s\n"
 "Skal installationen fortsættes alligevel?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakke, %d MB)"
 msgstr[1] "(%d pakker, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Vær venlig at indsætte mediet med navnet %s"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Henter pakke %s..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...hentning mislykkedes: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Færdig"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -349,28 +365,27 @@ msgstr ""
 "%s\n"
 "Du ønsker måske at opdatere din urpmi-database"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Installationen fejlede:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "alting er allerede installeret"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Installationen færdig"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "fjerner %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "genstarter urpmi"
@@ -444,58 +459,52 @@ msgstr "Miljøkatalog %s eksisterer ikke"
 msgid "using specific environment on %s\n"
 msgstr "bruger særligt miljø på %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "kunne ikke åbne rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ugyldigt rpm-filnavn [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "henter rpm-fil [%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...hentning færdig"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...hentning mislykkedes: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kunne ikke nå rpm fil [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "kunne ikke fortolke spec-fil '%s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "kunne ikke registrere rpm-fil"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Inkompatibel arkitektur for rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "fejl ved registrering af lokale pakker"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Denne handling er forbudt ved kørsel i begrænset tilstand"
@@ -535,22 +544,22 @@ msgstr "intet udtryk at lukke"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "normalt venter urpmf en regexp. du bør bruge parameteren \"--literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-katalog eksisterer ikke"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan ikke bruge %s uden %s."
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan ikke bruge '%s' med '%s'."
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "For mange argumenter\n"
@@ -612,7 +621,8 @@ msgstr "%s er ikke tilgængelig, falder tilbage til %s"
 #: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "kan ikke læse proxy-indstillinger (ikke rettigheder nok til at læse %s)"
+msgstr ""
+"kan ikke læse proxy-indstillinger (ikke rettigheder nok til at læse %s)"
 
 #: ../urpm/download.pm:182
 #, c-format
@@ -644,82 +654,87 @@ msgstr "%s-fejl: Afsluttede med signalet '%d'."
 msgid "%s failed: exited with %d"
 msgstr "%s-fejl: Afsluttede med '%d'."
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "kopiering mislykkedes"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget mangler\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl mangler\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl-fejl: hentning afbrudt.\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync mangler\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh mangler\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla mangler\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Kunne ikke køre prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 mangler\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s %% af %s færdiggjort. Tid igen: %s. Hastighed: %s."
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s %% færdiggjort. Hastighed: %s."
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "henter %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "hentede %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ukendt protokol defineret for %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "Ingen webhentning fundet, understøttede webhentninger er: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "kunne ikke behandle protokol: %s"
@@ -739,59 +754,60 @@ msgstr "pakke %s er ikke fundet."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "henter rpm-filer fra medie '%s'..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[genpakning]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "oprettede transaktion for installering på %s (fjern=%d, installér=%d, "
 "opgradér=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "kan ikke oprette transaktion"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "kan ikke udpakke rpm fra delta-rpm pakke %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "kunne ikke installere pakke %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "fjerner dårlig rpm-pakke (%s) fra %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "fjernelse af %s mislykkedes: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Fjerner pakke %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "fjerner pakke %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "fjerner installerede pakker (%s) fra %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Mere information om pakke %s"
@@ -836,18 +852,23 @@ msgstr "afbryder"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s-database er låst (et andet program bruger den allerede)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Installationen fejlede"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Prøv at fortsætte alligevel (j/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -856,57 +877,57 @@ msgstr ""
 "Installationen fejlede, dårlige rpm-pakker:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Den følgende pakke har dårlig signatur"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "De følgende pakker har dårlige signaturer"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ønsker du at fortsætte installationen?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "fjerner installerede rpm'er (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuerer %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "installerer %s fra %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "installerer %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Prøv endnu hårdere at installere (--force)? (j/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pakkerne er af nyeste version"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Installation er mulig"
@@ -1110,7 +1131,7 @@ msgstr "kopiering af [%s] mislykkedes (filen er mistænkeligt lille)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "beregner md5sum på hentet kilde-syntese"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "hentning af [%s] mislykkedes (md5sum-uoverensstemmelse)"
@@ -1150,32 +1171,32 @@ msgstr "ingen metadata fundet for medie \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "henter kilde-syntese for \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "undersøger pubkey-fil for '%s'"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importeret nøgle %s fra pubkey-fil for \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kunne ikke importere pubkey-fil for \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ingen syntese-fil fundet for medie \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "opdaterede medie %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "hentning af [%s] mislykkedes"
@@ -1190,94 +1211,99 @@ msgstr "forsøger igen med spejl %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Kunne ikke finde et spejl fra spejlliste %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "fandt geografisk sted %s %.2f %.2f fra tidszone %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "får spejlliste fra %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyJj"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Undskyld, dårligt valg, prøv igen\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pakke"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Version"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Udgivelse"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arkitektur"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(forslag)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "medie \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "kommandolinje"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1366,299 +1392,6 @@ msgstr "monterer %s"
 msgid "unmounting %s"
 msgstr "afmonterer %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf version %s\n"
-"Ophavsret © 2002-2006 Mandriva.\n"
-"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
-"\n"
-"brug: urpmf [tilvalg] mønster-udtryk\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - udskriv dette værktøjs versionsnummer.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - brug specifikt miljø (typisk ved en fejlrapport).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - brug ikke de opgivne medier, adskilt med komma.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - kontrollér ikke søgestrenge, brug argumenter som "
-"bogstavelige strenge.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - Brug anden rod for urpmi-database og rpm-installering.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - sortér medier ifølge delstrenge, adskilt med komma.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - Brug denne sti for adgang til media.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq          - udskriv ikke identiske linjer.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - brug kun opdateringsmedie.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - udførlig tilstand.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignorér forskel på store og små bogstaver i alle "
-"mønstre.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - skeln mellem store og små bogstaver i søgestrenge "
-"(standard).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - ændr feltseparator (standard er ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Søgestrengsudtryk:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - al tekst er forstået som regulære udtryk, med mindre -l "
-"er brugt.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inkludér perl-kode direkte som perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binær OG-operator.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binær ELLER-operator.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - negation.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - venstre- og højreparenteser.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Liste over mærker:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - angiv et printf-lignende uddata-format\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   eksempel: '%%navn:%%filer'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arkitektur\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost     - byggevært\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - byggetidspunkt\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - konfigurationsfiler\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - konfliktmærker\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - pakkebeskrivelse.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribution\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epoke\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - filnavn på pakken\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - liste over filer i pakken\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - gruppe\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licens\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - pakkenavn\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - mærk forældet\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager      - pakkeprogram.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - tilbudsetiketter\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - afhængighedsetiketter\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - installeret størrelse\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - navn på kilde-rpm\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - Forslagsetiketter.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - sammendrag\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url           - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - leverandør\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - mediet i hvilken pakken blev fundet\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - udskriv version, udgave og arkitektur med navn.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Ugyldigt format: du kan kun bruge flerværdi-etiketter"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "ingen hdlist-fil tilgængelig for medie \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "ingen syntese-fil tilgængelig for medie \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "ingen xml-info-fil tilgængelig for medie \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1668,7 +1401,8 @@ msgstr ""
 
 #: ../urpm/select.pm:32
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 "Installationsprogrammet urpmi blev startet igen, og listen over prioriterede "
 "pakker blev ændret: %s mod %s"
@@ -1678,7 +1412,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Ingen pakke kaldet %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Følgende pakker indeholder %s: %s"
@@ -1688,47 +1422,47 @@ msgstr "Følgende pakker indeholder %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Du bør bruge \"-a\" for at bruge dem alle"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "fandt pakkerne %s i urpmi db, men ingen er installeret"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakke %s er allerede installeret"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pakkerne %s er allerede installerede"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "grundet manglende %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "pga. allerede installeret %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "grundet uopfyldt %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "prøver at fremme %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "for at kunne beholde %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1737,7 +1471,7 @@ msgstr ""
 "Den følgende pakke skal fjernes for at andre kan opgraderes:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1746,12 +1480,12 @@ msgstr ""
 "De følgende pakker skal fjernes for at andre kan opgraderes:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "for at kunne installere %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "grundet modstrid med %s"
@@ -1842,6 +1576,13 @@ msgstr "  --repackage    - Ompak filer før sletning\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - brug en anden root for rpm-fjernelse.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - Brug anden rod for urpmi-database og rpm-installering.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1871,84 +1612,371 @@ msgstr "  --verbose, -v  - udførlig tilstand.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vælg alle pakker matchende udtryk.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Kun superbrugeren har lov til at fjerne pakker"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "ukendte pakker"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "ukendt pakke"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Fjernelse af den følgende pakke vil skade dit system:"
 msgstr[1] "Fjernelse af de følgende pakker vil skade dit system:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting at fjerne"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Ingen forældreløse at fjerne"
 
-#: ../urpme:149
+#: ../urpme:151
 #, 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] "For at tilfredsstille afhængigheder vil den følgende pakke blive fjernet"
-msgstr[1] "For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"For at tilfredsstille afhængigheder vil den følgende pakke blive fjernet"
+msgstr[1] ""
+"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(forældreløs pakke)"
 msgstr[1] "ukendt pakke"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Skal %d pakke fjernes?"
 msgstr[1] "Skal %d pakker fjernes?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "afprøver fjernelse af %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Fjernelse mislykkedes"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Fjernelse er mulig"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf version %s\n"
+"Ophavsret © 2002-2006 Mandriva.\n"
+"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
+"\n"
+"brug: urpmf [tilvalg] mønster-udtryk\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - udskriv dette værktøjs versionsnummer.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - brug specifikt miljø (typisk ved en fejlrapport).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - brug ikke de opgivne medier, adskilt med komma.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - kontrollér ikke søgestrenge, brug argumenter som "
+"bogstavelige strenge.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sortér medier ifølge delstrenge, adskilt med komma.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - Brug denne sti for adgang til media.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq          - udskriv ikke identiske linjer.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - brug kun opdateringsmedie.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - udførlig tilstand.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignorér forskel på store og små bogstaver i alle "
+"mønstre.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - skeln mellem store og små bogstaver i søgestrenge "
+"(standard).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - ændr feltseparator (standard er ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Søgestrengsudtryk:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - al tekst er forstået som regulære udtryk, med mindre -l "
+"er brugt.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inkludér perl-kode direkte som perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binær OG-operator.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binær ELLER-operator.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - negation.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - venstre- og højreparenteser.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Liste over mærker:\n"
+"\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - angiv et printf-lignende uddata-format\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   eksempel: '%%navn:%%filer'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arkitektur\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost     - byggevært\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - byggetidspunkt\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - konfigurationsfiler\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - konfliktmærker\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - pakkebeskrivelse.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribution\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epoke\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - filnavn på pakken\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - liste over filer i pakken\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - gruppe\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licens\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - pakkenavn\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - mærk forældet\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager      - pakkeprogram.\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - tilbudsetiketter\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - afhængighedsetiketter\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - installeret størrelse\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - navn på kilde-rpm\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - Forslagsetiketter.\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - sammendrag\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url           - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - leverandør\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - mediet i hvilken pakken blev fundet\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - udskriv version, udgave og arkitektur med navn.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "uafsluttet udtryk (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Ugyldigt format: du kan kun bruge flerværdi-etiketter"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "ingen hdlist-fil tilgængelig for medie \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "ingen syntese-fil tilgængelig for medie \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "ingen xml-info-fil tilgængelig for medie \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2040,7 +2068,8 @@ msgstr "  --noclean      - fjern ikke rpm'er fra cache.\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 "  --replacepkgs  - gennemtving installering af pakker som allerede er "
 "installerede.\n"
@@ -2171,7 +2200,8 @@ msgstr "  --excludedocs  - udelader docs-filer.\n"
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - kontrollér ikke for ledig diskplads før installation.\n"
+msgstr ""
+"  --ignoresize   - kontrollér ikke for ledig diskplads før installation.\n"
 
 #: ../urpmi:139
 #, c-format
@@ -2237,7 +2267,8 @@ msgstr "  --debug        - meget udførlig tilstand.\n"
 #: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  navne eller rpm-filer givne på kommandolinjen vil blive installeret.\n"
+msgstr ""
+"  navne eller rpm-filer givne på kommandolinjen vil blive installeret.\n"
 
 #: ../urpmi:183
 #, c-format
@@ -2270,7 +2301,8 @@ msgstr "Normalt er dette --buildrequires"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "brug --buildrequires eller --install-src, forvalgt er --buildrequires"
 
 #: ../urpmi:253
@@ -2296,36 +2328,31 @@ msgstr ""
 "Fejl: %s ser ud til at være monteret kun læsbart.\n"
 "Brug --allow-force for at gennemtvinge handlingen."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Opdaterer medie...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (skal opgraderes)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (skal opgraderes)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (skal installeres)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (skal installeres)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2334,12 +2361,12 @@ msgstr ""
 "For at tilfredsstille afhængigheden af %s er én af de følgende pakker "
 "nødvendig:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hvad er dit valg? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2350,7 +2377,7 @@ msgstr ""
 "som er ældre end de installerede:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2361,7 +2388,7 @@ msgstr ""
 "som er ældre end de installerede:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2370,12 +2397,12 @@ msgstr ""
 "\n"
 "Fortsæt installationen alligevel?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2384,7 +2411,7 @@ msgstr ""
 "En forespurgt pakke kan ikke installeres:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2393,12 +2420,12 @@ msgstr ""
 "Nogen forespurgte pakker kan ikke installeres:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "fjernelse af pakke %s vil skade dit system"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2409,7 +2436,7 @@ msgstr ""
 "skal fjernes for at andre kan opgraderes:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2420,12 +2447,12 @@ msgstr ""
 "skal fjernes for at andre kan opgraderes:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(kun test, fjernelse vil egentlig ikke blive gennemført)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2436,46 +2463,46 @@ msgstr ""
 "afhængigheder:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Den følgende forældreløse pakke vil blive fjernet."
 msgstr[1] "De følgende forældreløse pakker vil blive fjernet."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(kun test, installation vil egentlig ikke blive gennemført)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s mere diskplads vil blive brugt."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s diskplads vil blive frigjort."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s pakker vil blive hentet."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Fortsæt installationen med de %d pakke?"
 msgstr[1] "Fortsæt installationen med de %d pakker?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tryk Enter når det er monteret..."
@@ -2536,7 +2563,8 @@ msgstr "  --curl         - brug 'curl' til at hente retrieve eksterne filer.\n"
 #: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
-msgstr "  --prozilla     - brug 'prozilla' til at hente retrieve eksterne filer.\n"
+msgstr ""
+"  --prozilla     - brug 'prozilla' til at hente retrieve eksterne filer.\n"
 
 #: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
@@ -2585,12 +2613,14 @@ msgstr "  --no-probe     - forsøg ikke at finde nogen syntese-fil.\n"
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
-msgstr "  --distrib      - opret automatisk alle media fra et installationsmedium.\n"
+msgstr ""
+"  --distrib      - opret automatisk alle media fra et installationsmedium.\n"
 
 #: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  - med --distrib, spøger om bekræftelse for hvert medie\n"
+msgstr ""
+"  --interactive  - med --distrib, spøger om bekræftelse for hvert medie\n"
 
 #: ../urpmi.addmedia:76
 #, c-format
@@ -2719,12 +2749,15 @@ msgstr "  --checkpoint   - sæt genpakkestart nu\n"
 #: ../urpmi.recover:35
 #, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr "  --noclean      - rens ikke ud i genpakningskatalog ved kontrolpunkt\n"
+msgstr ""
+"  --noclean      - rens ikke ud i genpakningskatalog ved kontrolpunkt\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
-msgstr "  --list         - list transaktioner siden opgivet dato/varighed-argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
+msgstr ""
+"  --list         - list transaktioner siden opgivet dato/varighed-argument\n"
 
 #: ../urpmi.recover:38
 #, c-format
@@ -2924,12 +2957,12 @@ msgstr "  -f             - gennemtving opdatering af syntese\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Kun superbrugeren har lov til at opdatere medier"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilføje et medie)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2938,17 +2971,17 @@ msgstr ""
 "mangler det element der skal opdateres\n"
 "(én af %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorerer medie %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "aktiverer medie %s"
@@ -3015,7 +3048,8 @@ msgstr "  --list-aliases - list tilgængelige parallelle aliaser.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - udskriv konfigurationen i form af urpmi.addmedia "
 "argumenter.\n"
@@ -3027,7 +3061,8 @@ msgstr "  --src          - næste pakke er en kildepakke (samme som -s).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - giv alle kildepakker før hentning (kun root).\n"
 
 #: ../urpmq:67
@@ -3204,12 +3239,15 @@ msgstr "Ingen xml-info for medie'%s', kun delvist resultat for pakkerne '%s'"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "Ingen 'xml-info for medie '%s', kan ikke vise noget resultat for pakken %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"Ingen 'xml-info for medie '%s', kan ikke vise noget resultat for pakken %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr "Ingen xml-info for medie '%s', kan ikke vise resultat for pakkerne %s"
 
 #: ../urpmq:473
@@ -3217,3 +3255,5 @@ msgstr "Ingen xml-info for medie '%s', kan ikke vise resultat for pakkerne %s"
 msgid "No changelog found\n"
 msgstr "Ingen ændringslog fundet\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Opdaterer medie...\n"
diff --git a/po/de.po b/po/de.po
index 098f8f82..cdf4b1f6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2009-02-11 10:16+0100\n"
 "Last-Translator: Oliver Burger <oliver.burger@wizard-fire.de>\n"
 "Language-Team: German <cooker-i18n@mandrivalinux.org>\n"
@@ -22,32 +22,30 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31
-#: ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM Installation"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fehler: kann die Datei %s nicht finden, Vorgang wird abgebrochen"
 
-#: ../gurpmi:46
-#: ../gurpmi2:174
-#: ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -55,12 +53,13 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Sie wollten es wahrscheinlich nicht auf dem Rechner installieren (installieren bietet die Möglichkeit den Quellcode zu ändern und zu kompilieren)\n"
+"Sie wollten es wahrscheinlich nicht auf dem Rechner installieren "
+"(installieren bietet die Möglichkeit den Quellcode zu ändern und zu "
+"kompilieren)\n"
 "\n"
 "Was wollen Sie machen?"
 
-#: ../gurpmi:74
-#: ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -75,7 +74,7 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -90,34 +89,33 @@ msgstr ""
 "\n"
 "Vielleicht bevorzugen Sie es nur zu speichern. Was ist Ihre Wahl?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Installieren"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../gurpmi:100
-#: ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Wähle Speicherort aus"
 
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
 #, c-format
 msgid ""
 "urpmi 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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -133,42 +131,38 @@ msgstr ""
 msgid "Options:"
 msgstr "Optionen:"
 
-#: ../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 ../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 "  --help         - Diese Hilfe-Botschaft anzeigen.\n"
 
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
-msgstr "  --auto         - nicht-interaktiver Modus, vorgegebene Antworten werden bei Fragen angenommen.\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+"  --auto         - nicht-interaktiver Modus, vorgegebene Antworten werden "
+"bei Fragen angenommen.\n"
 
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - Automatische Paketauswahl zur Aktualisierung des Systems.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - Automatische Paketauswahl zur Aktualisierung des "
+"Systems.\n"
 
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - Erzwinge Aufruf, sogar wenn einige Pakete nicht existieren.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
+"existieren.\n"
 
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -178,56 +172,56 @@ msgstr ""
 "                   (--no-verify-rpm deaktiviert das Verhalten,\n"
 "                   Voreingestellt: Kontrolle der Signaturen).\n"
 
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
 
-#: ../gurpmi.pm:53
-#: ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - Erlaube Suche in: Stellt zur Verfügung nach einem Paket.\n"
+msgstr ""
+"  -p             - Erlaube Suche in: Stellt zur Verfügung nach einem Paket.\n"
 
-#: ../gurpmi.pm:54
-#: ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - nicht in \"Stellt zur Verfügung\" nach dem Paket suchen.\n"
+msgstr ""
+"  -P             - nicht in \"Stellt zur Verfügung\" nach dem Paket suchen.\n"
 
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
+msgstr ""
+"  --root         - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
 
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - Versuch, ob die Installation korrekt verlaufen wird.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+"  --test         - Versuch, ob die Installation korrekt verlaufen wird.\n"
 
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr "  --searchmedia  - verwende nur die gegebenen Medien um nach der angeforderten Paketen zu suchen\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr ""
+"  --searchmedia  - verwende nur die gegebenen Medien um nach der "
+"angeforderten Paketen zu suchen\n"
 
 #: ../gurpmi.pm:100
 #, c-format
 msgid "No packages specified"
 msgstr "Keine Pakete angegeben"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Sie müssen root sein"
@@ -258,107 +252,111 @@ msgstr ""
 "%s\n"
 "Wollen Sie trotzdem fortfahren?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../gurpmi2:134
-#: ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (zu aktualisieren)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (zu installieren)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Paketwahl"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Eines der folgenden Pakete wird benötigt:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Abbruch"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
 "Continue installation anyway?"
 msgstr ""
-"Die folgenden Pakete müssen entfernt werden, um andere aktualisieren zu können:\n"
+"Die folgenden Pakete müssen entfernt werden, um andere aktualisieren zu "
+"können:\n"
 "%s\n"
 "Wollen Sie trotzdem fortfahren?"
 
-#: ../gurpmi2:240
-#: ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Um die Abhängigkeiten zu erfüllen, wird folgendes Paket installiert:"
 
-#: ../gurpmi2:241
-#: ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d Paket, %d MB)"
 msgstr[1] "(%d Pakete, %d MB)"
 
-#: ../gurpmi2:257
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Ich kann die Quellpakete nicht finden, Abbruch"
 
-#: ../gurpmi2:265
-#: ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Vorbereiten ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installieren des Pakets `%s' (%s/%s)..."
 
-#: ../gurpmi2:286
-#: ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Bitte legen Sie das Medium mit dem Namen \"%s\" ein"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Holen des Pakets `%s' ..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...Holen fehlgeschlagen: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Fertig"
 
-#: ../gurpmi2:331
-#: ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -369,33 +367,27 @@ msgstr ""
 "%s\n"
 "Sie sollten Ihre urpmi-Datenbank aktualisieren"
 
-#: ../gurpmi2:337
-#: ../urpm/main_loop.pm:226
-#: ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262
-#: ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Installation fehlgeschlagen:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Alles bereits installiert"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Installation beendet"
 
-#: ../gurpmi2:345
-#: ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "Entferne %s"
 
-#: ../gurpmi2:353
-#: ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "starte urpmi neu"
@@ -434,8 +426,7 @@ msgstr "                    Voreinstellung ist %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - Voller RPM Name (NVRA)\n"
 
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Nur der Systemadministrator darf Pakete installieren"
@@ -465,76 +456,62 @@ msgstr "Pakete können nicht ind das Verzeichnis [%s] gespeichert werden"
 msgid "Environment directory %s does not exist"
 msgstr "Das angegebene Verzeichnis %s existiert nicht"
 
-#: ../urpm.pm:141
-#: ../urpmf:248
-#: ../urpmq:165
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "nutze spezielle Umgebung für %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "Es kann die rpmdb nicht geöffnet werden"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Ungültiger RPM Name [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Holen des RPMs [%s] ..."
 
-#: ../urpm.pm:327
-#: ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...Holen fertig"
 
-#: ../urpm.pm:330
-#: ../urpm/download.pm:777
-#: ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830
-#: ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...Holen fehlgeschlagen: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Nicht möglich spec file %s [%s] zu parsen"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "Ich kann die RPM-Datei nicht registrieren"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Nicht kompatible Architektur für RPM [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "Fehler bei der Registrierung lokaler Pakete"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Diese Funktion ist während des eingeschränkten Modus verboten"
 
-#: ../urpm/args.pm:152
-#: ../urpm/args.pm:161
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "Ungültige Proxyangabe als Kommandozeilenparameter\n"
@@ -567,48 +544,50 @@ msgstr "Kein Ausdruck zu schließen"
 #: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "Als Standard erwartet urpmf einen regulären Ausdruck. Sie sollten die Option \"--literal\" verwenden"
+msgstr ""
+"Als Standard erwartet urpmf einen regulären Ausdruck. Sie sollten die Option "
+"\"--literal\" verwenden"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot Verzeichnis existiert nicht"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Es ist nicht möglich %s ohne %s zu verwenden"
 
-#: ../urpm/args.pm:497
-#: ../urpm/args.pm:500
-#: ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Es ist nicht möglich %s mit %s zu verwenden"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "zu viele Argumente\n"
 
-#: ../urpm/bug_report.pm:54
-#: ../urpmi:259
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Kopieren fehlgeschlagen"
 
 #: ../urpm/cdrom.pm:66
 #, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Sie müssen die CD-ROM selbst einbinden (oder perl-Hal-Cdroms installieren, um dies automatisch durchführen zu lassen)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Sie müssen die CD-ROM selbst einbinden (oder perl-Hal-Cdroms installieren, "
+"um dies automatisch durchführen zu lassen)"
 
 #: ../urpm/cdrom.pm:68
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "Der HAL Dämon (hald) läuft nicht oder ist nicht bereit"
 
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "Das Medium \"%s\" ist nicht verfügbar"
@@ -633,9 +612,7 @@ msgstr "Es ist nicht möglich die Konfigurationsdatei [%s] zu lesen"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "Medium `%s' ist schon vorhanden, Abbruch"
 
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:497
-#: ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden"
@@ -648,7 +625,8 @@ msgstr "%s ist nicht verfügbar. Zurück zur %s"
 #: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "kann die Proxy-Einstellungen nicht lesen (ungenügende Leserechte für %s)"
+msgstr ""
+"kann die Proxy-Einstellungen nicht lesen (ungenügende Leserechte für %s)"
 
 #: ../urpm/download.pm:182
 #, c-format
@@ -680,82 +658,89 @@ msgstr "%s Fehler: Beendet mit Signal %d"
 msgid "%s failed: exited with %d"
 msgstr "%s Fehler: beende mit %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "Kopieren fehlgeschlagen"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget fehlt\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl fehlt\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl fehlt: Download abgebrochen\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync fehlt\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh fehlt\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla fehlt\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Prozilla kann nicht ausgeführt werden\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 fehlt\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% von %s abgeschlossen, verbleibende Zeit = %s, Geschwindigkeit = %s"
+msgstr ""
+"        %s%% von %s abgeschlossen, verbleibende Zeit = %s, Geschwindigkeit = "
+"%s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% abgeschlossen, Geschwindigkeit = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "frage %s ab"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "rufe %s ab"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "Unbekanntes Protokoll für %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "kein webfetch gefunden, unterstützte webfetch sind: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "Ich kann mit dem Prtokoll %s nicht umgehen"
@@ -775,58 +760,60 @@ msgstr "Paket %s wurde nicht gefunden."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "Holen der RPMs von Medium \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[neupacken]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "Stelle Vorgang zum Installieren auf %s (entfernen=%d, installieren=%d, upgraden=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"Stelle Vorgang zum Installieren auf %s (entfernen=%d, installieren=%d, "
+"upgraden=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "unmöglich den Vorgang einzuleiten"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "Das RPM-Paket kann nicht vom Delta-RPM %s extrahiert werden"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "Ich kann das Paket %s nicht installieren"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "entferne fehlerhaftes rpm (%s) von %s"
 
-#: ../urpm/install.pm:212
-#: ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "Entfernen von %s fehlgeschlagen: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Entferne das Paket %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "Entfernen des Pakets %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "entferne installierte rpms (%s) von %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Mehr Informationen über das Paket %s"
@@ -851,8 +838,7 @@ msgstr "Kein Server definiert, es fehlt eine uri oder Host"
 msgid "No base defined"
 msgstr "Kein Bezug definiert"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Es ist nicht möglich zur ldap uri zuverbinden: "
@@ -870,24 +856,27 @@ msgstr "abbrechen"
 #: ../urpm/lock.pm:65
 #, c-format
 msgid "%s database is locked (another program is already using it)"
-msgstr "Die %s Datenbank ist gesperrt ( ein anderes laufendes Programm nutzt sie bereits)"
+msgstr ""
+"Die %s Datenbank ist gesperrt ( ein anderes laufendes Programm nutzt sie "
+"bereits)"
+
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
 
-#: ../urpm/main_loop.pm:113
-#: ../urpm/main_loop.pm:123
-#: ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233
-#: ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Die Installation schlug Fehl"
 
-#: ../urpm/main_loop.pm:115
-#: ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Trotzdem versuchen? (j/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -896,58 +885,57 @@ msgstr ""
 "Installation fehlgeschlagen, fehlerhafte rpms:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Folgendes Paket hat eine inkorrekte Signatur"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Folgenden Pakete haben inkorrekte Signaturen"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wollen Sie die Installation fortsetzen?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "entferne installierte rpms (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "Verteile %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "Installiere %s von %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "Installiere %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Soll ich eine Installation erzwingen (--force)? (j/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Die Pakete sind auf dem aktuellen Stand"
 
-#: ../urpm/main_loop.pm:313
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Die Installation ist möglich"
@@ -960,7 +948,9 @@ msgstr "Warnung: md5sum für %s nicht verfügbar in MD5SUM Datei"
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "Das virtuelle Medium \"%s\" sollte eine eindeutige URL haben, es wird ignoriert"
+msgstr ""
+"Das virtuelle Medium \"%s\" sollte eine eindeutige URL haben, es wird "
+"ignoriert"
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -970,7 +960,9 @@ msgstr "Konnte nicht auf Listendatei von \"%s\" zugreifen, Medium ignoriert"
 #: ../urpm/media.pm:213
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
-msgstr "Es ist nicht möglich, auf die Synthesis-Datei von \"%s\" zuzugreifen, das Medium wird daher ignoriert"
+msgstr ""
+"Es ist nicht möglich, auf die Synthesis-Datei von \"%s\" zuzugreifen, das "
+"Medium wird daher ignoriert"
 
 #: ../urpm/media.pm:240
 #, c-format
@@ -982,8 +974,7 @@ msgstr "versuche existierendes Medium \"%s\" zu überschreiben, überspringe"
 msgid "failed to migrate removable device, ignoring media"
 msgstr ""
 
-#: ../urpm/media.pm:499
-#: ../urpm/media.pm:505
+#: ../urpm/media.pm:499 ../urpm/media.pm:505
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "Schreiben der Konfigurationsdatei [%s]"
@@ -1000,8 +991,12 @@ msgstr "Verwende assoziiertes Medium für den parallelen Modus: %s"
 
 #: ../urpm/media.pm:572
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis kann nicht verwendet werden mit --media, --excludemedia, --sortmedia, --update, --use-distrib oder --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis kann nicht verwendet werden mit --media, --excludemedia, --"
+"sortmedia, --update, --use-distrib oder --parallel"
 
 #: ../urpm/media.pm:666
 #, c-format
@@ -1056,7 +1051,9 @@ msgstr "Nicht möglich media.cfg zu parsen"
 #: ../urpm/media.pm:831
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "Es ist nicht möglich das Distributionsmedium zu verwenden (keine media.cfg Datei gefunden)"
+msgstr ""
+"Es ist nicht möglich das Distributionsmedium zu verwenden (keine media.cfg "
+"Datei gefunden)"
 
 #: ../urpm/media.pm:849
 #, c-format
@@ -1118,15 +1115,12 @@ msgstr "Lesen der Synthese-Datei [%s]"
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Probleme beim Lesen der Synthese-Datei des Mediums \"%s\""
 
-#: ../urpm/media.pm:1168
-#: ../urpm/media.pm:1263
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Kopiere [%s] zu Medium \"%s\" ..."
 
-#: ../urpm/media.pm:1170
-#: ../urpm/media.pm:1240
-#: ../urpm/media.pm:1493
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
 #, c-format
 msgid "...copying failed"
 msgstr "...das Kopieren scheiterte"
@@ -1136,8 +1130,7 @@ msgstr "...das Kopieren scheiterte"
 msgid "copying description file of \"%s\"..."
 msgstr "Kopiere Beschreibungs-Datei von \"%s\"..."
 
-#: ../urpm/media.pm:1238
-#: ../urpm/media.pm:1267
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "... das Kopieren ist beendet"
@@ -1152,8 +1145,7 @@ msgstr "kopieren von [%s] fehlgeschlagen (Datei ist verdächtig klein)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "Errechne md5sum der erhaltenen Synthese-Datei der Quelle"
 
-#: ../urpm/media.pm:1319
-#: ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Holen von [%s] fehlgeschlagen (md5sum fehlerhaft)"
@@ -1193,38 +1185,37 @@ msgstr "Keine Metadaten für das Medium \"%s\" gefunden"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "Hole Synthese-Datei der Quelle \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Holen der Pubkey-Datei für \"%s\" ..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importierter Schlüssel %s von Pubkey-Datei von \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kann die Pubkey-Datei für \"%s\" nicht importieren"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "Synthese-Datei für das Medium \"%s\" gefunden"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "Aktualisiere Medium \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "Holen von [%s] fehlgeschlagen"
 
-#: ../urpm/mirrors.pm:19
-#: ../urpm/mirrors.pm:40
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
 #, c-format
 msgid "trying again with mirror %s"
 msgstr "versuche es erneut mit der Mirror %s"
@@ -1234,106 +1225,109 @@ msgstr "versuche es erneut mit der Mirror %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Konnte keinen Mirror der Mirrorliste %s finden"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "Hole Mirror-Liste von%s"
 
-#: ../urpm/msg.pm:63
-#: ../urpmi:502
-#: ../urpmi:517
-#: ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:553
-#: ../urpmi:648
-#: ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Paket"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Version"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Release"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arch"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(vorschlag)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "Medium \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "Kommandozeile"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "Das folgende Paket ist nun verwaist, nutzen Sie \"urpme --auto-orphans\", um es zu entfernen."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"Das folgende Paket ist nun verwaist, nutzen Sie \"urpme --auto-orphans\", um "
+"es zu entfernen."
 msgstr[1] ""
 
 #: ../urpm/parallel.pm:14
@@ -1388,16 +1382,19 @@ msgstr "Cp schlug auf Server %s fehl (%d)"
 
 #: ../urpm/parallel_ssh.pm:86
 #, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "%s schlug auf Host %s fehl (hat es vielleicht keine geeignete urpmi Version?) (Fehlerzeichen: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s schlug auf Host %s fehl (hat es vielleicht keine geeignete urpmi "
+"Version?) (Fehlerzeichen: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "Es ist nicht möglichauf das Medium \"%s\" zugreifen."
 
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "Einhängen von %s"
@@ -1407,668 +1404,613 @@ msgstr "Einhängen von %s"
 msgid "unmounting %s"
 msgstr "Aushängen von %s"
 
-#: ../urpm/search.pm:29
+#: ../urpm/select.pm:30
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"Urpmi wurde neu gestartet, und die Liste der vorrangigen Pakete hat sich "
+"nicht geändert"
+
+#: ../urpm/select.pm:32
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"Urpmi wurde neu gestartet, und die Liste der vorrangigen Pakete hat sich "
+"geändert: %s gegenüber %s"
+
+#: ../urpm/select.pm:170
+#, c-format
+msgid "No package named %s"
+msgstr "Kein Paket mit dem Namen %s gefunden"
+
+#: ../urpm/select.pm:172 ../urpme:117
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Die folgenden Pakete enthalten %s: %s"
+
+#: ../urpm/select.pm:174
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr "Nutze \"-a\" um alle zu nutzen"
+
+#: ../urpm/select.pm:294
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr ""
+"Paket(e) %s in der urpmi-Datenbank gefunden, sind jedoch nicht installiert."
+
+#: ../urpm/select.pm:537
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Paket %s ist installiert"
+
+#: ../urpm/select.pm:538
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakete %s sind installiert"
+
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#, c-format
+msgid "due to missing %s"
+msgstr "wegen fehlendem %s"
+
+#: ../urpm/select.pm:557
+#, c-format
+msgid "due to already installed %s"
+msgstr "da %s bereits installiert ist"
+
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "wegen nicht erfüllter Abhängigkeit von %s "
+
+#: ../urpm/select.pm:564
+#, c-format
+msgid "trying to promote %s"
+msgstr "versuche %s voranzubringen"
+
+#: ../urpm/select.pm:565
+#, c-format
+msgid "in order to keep %s"
+msgstr "um %s zu behalten"
+
+#: ../urpm/select.pm:606
+#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Das folgende Paket muss entfernt werden, um die Aktualisierungen \n"
+"durchführen zu können:\n"
+"%s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
+"durchführen zu können:\n"
+"%s"
+
+#: ../urpm/select.pm:634
+#, c-format
+msgid "in order to install %s"
+msgstr "um %s zu installieren"
+
+#: ../urpm/select.pm:644
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "wegen Konflikten mit %s"
+
+#: ../urpm/signature.pm:32
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Falsche Signatur (%s)"
+
+#: ../urpm/signature.pm:63
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Ungültige Schlüssel ID (%s)"
+
+#: ../urpm/signature.pm:65
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Fehlende Signatur (%s)"
+
+#: ../urpm/sys.pm:178
+#, c-format
+msgid "system"
+msgstr "System"
+
+#: ../urpm/sys.pm:213
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Sie sollten %s aufgrund des Updates von %s neustarten"
+
+#: ../urpm/sys.pm:316
+#, c-format
+msgid "Can't write file"
+msgstr "Kann Datei nicht schreiben"
+
+#: ../urpm/sys.pm:316
+#, c-format
+msgid "Can't open file"
+msgstr "Kann Datei nicht öffnen"
+
+#: ../urpm/sys.pm:329
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Kann Datei %s nicht nach %s verschieben"
+
+#: ../urpme:41
+#, 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"
+msgstr ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"vertrieben werden.\n"
+"\n"
+"Verwendung:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "--auto-orphans - deinstalliert verwaiste Pakete\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+" --parallel     - verteilter urpmi Aufruf auf allen teilnehmenden\n"
+"                  Maschinen.\n"
+
+#: ../urpme:52 ../urpmi:142
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - neupacken vor dem Löschen\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --root         - benutze anderes Wurzelverzeichnis zur RPM Entfernung.\n"
+
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - benutze anderes Wurzelverzeichnis für urpmi db & RPM "
+"Installation.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - aktualisiere lediglich die rpm db, nicht das "
+"Dateisystem.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - Paket-Skripte nicht ausführen.\n"
+
+#: ../urpme:57
+#, 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"
+msgstr ""
+"  --use-distrib  - Konfiguriere urpme von einem distrib Baum, nützlich\n"
+"                  um einen chroot mit --root Option zu (de)installieren.\n"
+
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - ausführlicher Modus.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - wähle alle Pakete, die dem Ausdruck gleichen.\n"
+
+#: ../urpme:75
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Nur der Systemadministrator darf Pakete entfernen"
+
+#: ../urpme:108
+#, c-format
+msgid "unknown packages"
+msgstr "unbekannte Pakete "
+
+#: ../urpme:108
+#, c-format
+msgid "unknown package"
+msgstr "unbekanntes Paket"
+
+#: ../urpme:123
+#, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Das Entfernen des folgenden Pakets macht Ihr System unbrauchbar:"
+msgstr[1] "Das Entfernen der folgenden Pakete macht Ihr System unbrauchbar:"
+
+#: ../urpme:128
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nichts zu entfernen"
+
+#: ../urpme:145
+#, c-format
+msgid "No orphans to remove"
+msgstr "Keine Waisen zu entfernen"
+
+#: ../urpme:151
+#, 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] "Um die Abhängigkeiten zu erfüllen, wird das folgende Paket entfernt"
+msgstr[1] ""
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden %d Pakete entfernt"
+
+#: ../urpme:156
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "verwaiste Paket"
+msgstr[1] "verwaiste Pakete"
+
+#: ../urpme:163
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Entfernen das Paket %d?"
+msgstr[1] "Entfernen der Pakete %d?"
+
+#: ../urpme:168
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:185
+#, c-format
+msgid "Removal failed"
+msgstr "Entfernen schlug fehl"
+
+#: ../urpme:187
+#, c-format
+msgid "Removal is possible"
+msgstr "Entfernen ist möglich"
+
 #: ../urpmf:29
 #, 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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
 "urpmf version %s\n"
 "Copyright (C) 2002-2006 Mandriva.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter vertrieben werden.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
+"vertrieben werden.\n"
 "\n"
 "Verwendung: urpmf [Optionen] Muster-Ausdruck\n"
 
-#: ../urpm/search.pm:36
 #: ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - Ausgabe der Versionsnummer dieses Tools.\n"
 
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
 "                   Erstellung von Fehlerberichten).\n"
 
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - Benutze keine durch Kommata getrennte Medienliste.\n"
+msgstr ""
+"  --excludemedia - Benutze keine durch Kommata getrennte Medienliste.\n"
 
-#: ../urpm/search.pm:39
 #: ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - passe die Schablone nicht an, sondern benutze es als string\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - benutze anderes Wurzelverzeichnis für urpmi db & RPM Installation.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - passe die Schablone nicht an, sondern benutze es als "
+"string\n"
 
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - sortiere Medien gemäß der Substrings getrennt durch Kommata.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sortiere Medien gemäß der Substrings getrennt durch "
+"Kommata.\n"
 
-#: ../urpm/search.pm:43
 #: ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
 "                   der urpmi-DB.\n"
 
-#: ../urpm/search.pm:45
 #: ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - keine identischen Zeilen ausgeben.\n"
 
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
 
-#: ../urpm/search.pm:47
 #: ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ausführlicher Modus.\n"
 
-#: ../urpm/search.pm:48
 #: ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ignoriere Fallunterscheidungen in jedem Muster.\n"
 
-#: ../urpm/search.pm:49
 #: ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - ignoriere Fallunterscheidungen in jedem Muster (standart).\n"
+msgstr ""
+"  -i             - ignoriere Fallunterscheidungen in jedem Muster "
+"(standart).\n"
 
-#: ../urpm/search.pm:50
 #: ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - ändert den Feldtrenner (Voreinstellung ':').\n"
 
-#: ../urpm/search.pm:51
 #: ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Musterausdrücke:\n"
 
-#: ../urpm/search.pm:52
 #: ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "  text           - jeder Text wird als regulärer Ausdruck geparst, bis -l benutzt wird.\n"
+msgstr ""
+"  text           - jeder Text wird als regulärer Ausdruck geparst, bis -l "
+"benutzt wird.\n"
 
-#: ../urpm/search.pm:53
 #: ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - beziehe Perl Code direkt als perl -e ein.\n"
 
-#: ../urpm/search.pm:54
 #: ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binärer UND operator.\n"
 
-#: ../urpm/search.pm:55
 #: ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o              - binärer ODER Operator.\n"
 
-#: ../urpm/search.pm:56
 #: ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unäres NICHT.\n"
 
-#: ../urpm/search.pm:57
 #: ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - linke und rechte Klammern.\n"
 
-#: ../urpm/search.pm:58
 #: ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Liste der Markierungen:\n"
 
-#: ../urpm/search.pm:59
 #: ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - angeben eines printf-ähnlichen Ausgabeformats\n"
 
-#: ../urpm/search.pm:60
 #: ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   Beispiel: '%%name:%%files'\n"
 
-#: ../urpm/search.pm:61
 #: ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - Architektur\n"
 
-#: ../urpm/search.pm:62
 #: ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    -  Build host.\n"
 
-#: ../urpm/search.pm:63
 #: ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - build Zeit\n"
 
-#: ../urpm/search.pm:64
 #: ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - Konfigurationsdateien\n"
 
-#: ../urpm/search.pm:65
 #: ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - Steht in Konflikt mit.\n"
 
-#: ../urpm/search.pm:66
 #: ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - Paketbeschreibung\n"
 
-#: ../urpm/search.pm:67
 #: ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - Distribution\n"
 
-#: ../urpm/search.pm:68
 #: ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - Epoche\n"
 
-#: ../urpm/search.pm:69
 #: ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - Dateiname des Pakets\n"
 
-#: ../urpm/search.pm:70
 #: ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - Liste der Dateien, die in dem Paket enthalten sind\n"
+msgstr ""
+"  --files        - Liste der Dateien, die in dem Paket enthalten sind\n"
 
-#: ../urpm/search.pm:71
 #: ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - Gruppe\n"
 
-#: ../urpm/search.pm:72
 #: ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license         - Lizens\n"
 
-#: ../urpm/search.pm:73
 #: ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - Paketname\n"
 
-#: ../urpm/search.pm:74
 #: ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - Veraltet.\n"
 
-#: ../urpm/search.pm:75
 #: ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     -  Packer.\n"
 
-#: ../urpm/search.pm:76
 #: ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - Stellt zur Verfügung\n"
 
-#: ../urpm/search.pm:77
 #: ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - Benötigt\n"
 
-#: ../urpm/search.pm:78
 #: ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - Größe\n"
 
-#: ../urpm/search.pm:79
 #: ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - Quell RPM Name.\n"
 
-#: ../urpm/search.pm:80
 #: ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 
-#: ../urpm/search.pm:81
 #: ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - Zusammenfassung\n"
 
-#: ../urpm/search.pm:82
 #: ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpm/search.pm:83
 #: ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - Hersteller\n"
 
-#: ../urpm/search.pm:84
 #: ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - das Mediium, in welchem das Paket gefunden wurde\n"
 
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:99
+#: ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - Ausgabe von Version, Release und Architektur mit dem Namen.\n"
+msgstr ""
+"  -f             - Ausgabe von Version, Release und Architektur mit dem "
+"Namen.\n"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
 
-#: ../urpm/search.pm:197
 #: ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Fehlerhaftes Format: Sie können nur ein mehrfach Zweig anhängen"
 
-#: ../urpm/search.pm:290
 #: ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "Keine HD-Liste für das Medium \"%s\" verfügbar"
 
-#: ../urpm/search.pm:297
 #: ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "Keine Synthesis-Liste für das Medium \"%s\" gefunden"
 
-#: ../urpm/search.pm:304
 #: ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "keine xml-Info für das Medium \"%s\" verfügbar"
 
-#: ../urpm/select.pm:30
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "Urpmi wurde neu gestartet, und die Liste der vorrangigen Pakete hat sich nicht geändert"
-
-#: ../urpm/select.pm:32
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "Urpmi wurde neu gestartet, und die Liste der vorrangigen Pakete hat sich geändert: %s gegenüber %s"
-
-#: ../urpm/select.pm:170
-#, c-format
-msgid "No package named %s"
-msgstr "Kein Paket mit dem Namen %s gefunden"
-
-#: ../urpm/select.pm:172
-#: ../urpme:115
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Die folgenden Pakete enthalten %s: %s"
-
-#: ../urpm/select.pm:174
-#, c-format
-msgid "You should use \"-a\" to use all of them"
-msgstr "Nutze \"-a\" um alle zu nutzen"
-
-#: ../urpm/select.pm:295
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Paket(e) %s in der urpmi-Datenbank gefunden, sind jedoch nicht installiert."
-
-#: ../urpm/select.pm:538
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Paket %s ist installiert"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakete %s sind installiert"
-
-#: ../urpm/select.pm:557
-#: ../urpm/select.pm:641
-#, c-format
-msgid "due to missing %s"
-msgstr "wegen fehlendem %s"
-
-#: ../urpm/select.pm:558
-#, c-format
-msgid "due to already installed %s"
-msgstr "da %s bereits installiert ist"
-
-#: ../urpm/select.pm:559
-#: ../urpm/select.pm:639
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "wegen nicht erfüllter Abhängigkeit von %s "
-
-#: ../urpm/select.pm:565
-#, c-format
-msgid "trying to promote %s"
-msgstr "versuche %s voranzubringen"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "in order to keep %s"
-msgstr "um %s zu behalten"
-
-#: ../urpm/select.pm:607
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Das folgende Paket muss entfernt werden, um die Aktualisierungen \n"
-"durchführen zu können:\n"
-"%s"
-
-#: ../urpm/select.pm:608
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
-"durchführen zu können:\n"
-"%s"
-
-#: ../urpm/select.pm:635
-#, c-format
-msgid "in order to install %s"
-msgstr "um %s zu installieren"
-
-#: ../urpm/select.pm:645
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "wegen Konflikten mit %s"
-
-#: ../urpm/signature.pm:32
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Falsche Signatur (%s)"
-
-#: ../urpm/signature.pm:63
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ungültige Schlüssel ID (%s)"
-
-#: ../urpm/signature.pm:65
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Fehlende Signatur (%s)"
-
-#: ../urpm/sys.pm:178
-#, c-format
-msgid "system"
-msgstr "System"
-
-#: ../urpm/sys.pm:213
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Sie sollten %s aufgrund des Updates von %s neustarten"
-
-#: ../urpm/sys.pm:316
-#, c-format
-msgid "Can't write file"
-msgstr "Kann Datei nicht schreiben"
-
-#: ../urpm/sys.pm:316
-#, c-format
-msgid "Can't open file"
-msgstr "Kann Datei nicht öffnen"
-
-#: ../urpm/sys.pm:329
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Kann Datei %s nicht nach %s verschieben"
-
-#: ../urpme:41
-#, 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"
-msgstr ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
-"vertrieben werden.\n"
-"\n"
-"Verwendung:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "--auto-orphans - deinstalliert verwaiste Pakete\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
-
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-" --parallel     - verteilter urpmi Aufruf auf allen teilnehmenden\n"
-"                  Maschinen.\n"
-
-#: ../urpme:52
-#: ../urpmi:142
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - neupacken vor dem Löschen\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - benutze anderes Wurzelverzeichnis zur RPM Entfernung.\n"
-
-#: ../urpme:55
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - aktualisiere lediglich die rpm db, nicht das Dateisystem.\n"
-
-#: ../urpme:56
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - Paket-Skripte nicht ausführen.\n"
-
-#: ../urpme:57
-#, 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"
-msgstr ""
-"  --use-distrib  - Konfiguriere urpme von einem distrib Baum, nützlich\n"
-"                  um einen chroot mit --root Option zu (de)installieren.\n"
-
-#: ../urpme:59
-#: ../urpmi:153
-#: ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - ausführlicher Modus.\n"
-
-#: ../urpme:60
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - wähle alle Pakete, die dem Ausdruck gleichen.\n"
-
-#: ../urpme:73
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Nur der Systemadministrator darf Pakete entfernen"
-
-#: ../urpme:106
-#, c-format
-msgid "unknown packages"
-msgstr "unbekannte Pakete "
-
-#: ../urpme:106
-#, c-format
-msgid "unknown package"
-msgstr "unbekanntes Paket"
-
-#: ../urpme:121
-#, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Das Entfernen des folgenden Pakets macht Ihr System unbrauchbar:"
-msgstr[1] "Das Entfernen der folgenden Pakete macht Ihr System unbrauchbar:"
-
-#: ../urpme:126
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nichts zu entfernen"
-
-#: ../urpme:143
-#, c-format
-msgid "No orphans to remove"
-msgstr "Keine Waisen zu entfernen"
-
-#: ../urpme:149
-#, 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] "Um die Abhängigkeiten zu erfüllen, wird das folgende Paket entfernt"
-msgstr[1] "Um die Abhängigkeiten zu erfüllen, werden die folgenden %d Pakete entfernt"
-
-#: ../urpme:154
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "verwaiste Paket"
-msgstr[1] "verwaiste Pakete"
-
-#: ../urpme:161
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Entfernen das Paket %d?"
-msgstr[1] "Entfernen der Pakete %d?"
-
-#: ../urpme:161
-#: ../urpmi:554
-#: ../urpmi:649
-#: ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:166
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:181
-#, c-format
-msgid "Removal failed"
-msgstr "Entfernen schlug fehl"
-
-#: ../urpme:183
-#, c-format
-msgid "Removal is possible"
-msgstr "Entfernen ist möglich"
-
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
-msgstr "  --auto-update  - Automatische Paketauswahl zur Aktualisierung des Systems.\n"
+msgstr ""
+"  --auto-update  - Automatische Paketauswahl zur Aktualisierung des "
+"Systems.\n"
 
 #: ../urpmi:82
 #, c-format
@@ -2083,32 +2025,36 @@ msgstr "    --force-key    - erzwinge Update auf gpg Schlüssel.\n"
 #: ../urpmi:84
 #, c-format
 msgid "  --auto-orphans - remove orphans without asking\n"
-msgstr "  --auto-orphans - deinstalliert verwaiste Pakete ohne nach zu fragen\n"
+msgstr ""
+"  --auto-orphans - deinstalliert verwaiste Pakete ohne nach zu fragen\n"
 
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr ""
 
 #: ../urpmi:86
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr "  --no-uninstall - niemals fragen bei Paketdeinstallation, Installation abbrechen.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - niemals fragen bei Paketdeinstallation, Installation "
+"abbrechen.\n"
 
 #: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - installiere keine Pakete (nur herunterladen).\n"
 
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
-"  --keep         - behalte existierende Pakete wenn möglich, lehne angefragte\n"
+"  --keep         - behalte existierende Pakete wenn möglich, lehne "
+"angefragte\n"
 "                   Pakete ab, die zu einer Deinstallation führen.\n"
 
 #: ../urpmi:90
@@ -2154,8 +2100,10 @@ msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - erzwingt die Installation bereits installierter Pakete.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - erzwingt die Installation bereits installierter Pakete.\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2178,7 +2126,8 @@ msgstr ""
 #: ../urpmi:108
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
-msgstr "  --allow-suggests - wähle die \"vorgeschlagenen\" Pakete automatisch aus.\n"
+msgstr ""
+"  --allow-suggests - wähle die \"vorgeschlagenen\" Pakete automatisch aus.\n"
 
 #: ../urpmi:112
 #, c-format
@@ -2189,9 +2138,7 @@ msgstr ""
 "  --use-distrib  - konfiguriere urpmi von einem distrib Baum, nützlich\n"
 "                   zum Installieren eines chroot mit --root Option.\n"
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr "  --metalink     - generiert und nutzt einen lokalen Metalink.\n"
@@ -2208,31 +2155,34 @@ msgstr ""
 #: ../urpmi:118
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
-msgstr "  --curl-options - zusätzliche Optionen, die an curl weitergeleitet werden\n"
+msgstr ""
+"  --curl-options - zusätzliche Optionen, die an curl weitergeleitet werden\n"
 
 #: ../urpmi:119
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
-msgstr "  --rsync-options- zusätzliche Optionen, die an rsync weitergeleitet werden\n"
+msgstr ""
+"  --rsync-options- zusätzliche Optionen, die an rsync weitergeleitet werden\n"
 
 #: ../urpmi:120
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
-msgstr "  --wget-options - zusätzliche Optionen, die an wget weitergeleitet werden\n"
+msgstr ""
+"  --wget-options - zusätzliche Optionen, die an wget weitergeleitet werden\n"
 
 #: ../urpmi:121
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
-msgstr "  --prozilla-options - zusätzliche Optionen, die an prozilla weitergeleitet werden\n"
+msgstr ""
+"  --prozilla-options - zusätzliche Optionen, die an prozilla weitergeleitet "
+"werden\n"
 
 #: ../urpmi:122
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr ""
 
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - schränke die Dowloadgeschwindigkeit ein.\n"
@@ -2243,13 +2193,11 @@ msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"  --resume       - setze Transfer einer partiell-heruntergeladenen Datei fort\n"
+"  --resume       - setze Transfer einer partiell-heruntergeladenen Datei "
+"fort\n"
 "                   (--no-resume deaktiviert es, Vorgabe ist deaktiviert).\n"
 
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2258,10 +2206,7 @@ msgstr ""
 "  --proxy        - Verwende einen HTTP Proxy, als Standard-Portnummer\n"
 "                   wird 1080 angenommen (Format: <ProxyRechner[:port]>).\n"
 
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2293,12 +2238,15 @@ msgstr "  --excludedocs  - Schließe Dokumentationsdateien aus.\n"
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - nicht vor Installation den Festplattenplatz prüfen.\n"
+msgstr ""
+"  --ignoresize   - nicht vor Installation den Festplattenplatz prüfen.\n"
 
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - ermöglicht das installieren von RPMs für andere Achitekturen\n"
+msgstr ""
+"  --ignorearch   - ermöglicht das installieren von RPMs für andere "
+"Achitekturen\n"
 
 #: ../urpmi:140
 #, c-format
@@ -2313,7 +2261,8 @@ msgstr "  --replacefiles - ignoriere Dateikonflikte\n"
 #: ../urpmi:143
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
-msgstr "  --skip         - Pakete deren Installation übersprungen werden soll\n"
+msgstr ""
+"  --skip         - Pakete deren Installation übersprungen werden soll\n"
 
 #: ../urpmi:144
 #, c-format
@@ -2326,7 +2275,8 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --more-choices - falls mehrere Pakete gefunden wurden, schlage mehrere Möglichkeiten vor\n"
+"  --more-choices - falls mehrere Pakete gefunden wurden, schlage mehrere "
+"Möglichkeiten vor\n"
 "                   als  die Vorgabe.\n"
 
 #: ../urpmi:147
@@ -2337,10 +2287,10 @@ msgstr "  --nolock       - Die RPM-Datenbank nicht sperren.\n"
 #: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - Updaten Pakete, welche die selbe Architektur sind.\n"
+msgstr ""
+"  --strict-arch  - Updaten Pakete, welche die selbe Architektur sind.\n"
 
-#: ../urpmi:149
-#: ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
@@ -2365,7 +2315,9 @@ msgstr "  Namen oder RPM-Dateien von der Kommandozeile werden installiert.\n"
 #: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Fehler: Es ist nicht möglich --auto-select weiter mit der Paketliste zu verwenden.\n"
+msgstr ""
+"Fehler: Es ist nicht möglich --auto-select weiter mit der Paketliste zu "
+"verwenden.\n"
 
 #: ../urpmi:190
 #, c-format
@@ -2379,7 +2331,9 @@ msgstr ""
 #: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
-msgstr "Sie können keine binären RPM-Dateien installieren, wenn --install-src genutzt wird"
+msgstr ""
+"Sie können keine binären RPM-Dateien installieren, wenn --install-src "
+"genutzt wird"
 
 #: ../urpmi:221
 #, c-format
@@ -2393,13 +2347,18 @@ msgstr ""
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 
 #: ../urpmi:253
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Verzeichnis [%s] existiert bereits, bitte nutzen Sie ein anderes Verzeichnis für Fehlerberichte oder löschen Sie dieses"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Verzeichnis [%s] existiert bereits, bitte nutzen Sie ein anderes Verzeichnis "
+"für Fehlerberichte oder löschen Sie dieses"
 
 #: ../urpmi:254
 #, c-format
@@ -2415,46 +2374,45 @@ msgstr ""
 "Fehler: %s scheint nur lesbar gemountet zu sein.\n"
 "Benutzen Sie --allow-force um eine Operation zu erzwingen."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Aktualisiere Medien...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (zu aktualisieren)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (zu aktualisieren)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (zu installieren)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (zu installieren)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "Um die Abhängigkeit von '%s' zu erfüllen, wird eins der folgenden Paket benötigt:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"Um die Abhängigkeit von '%s' zu erfüllen, wird eins der folgenden Paket "
+"benötigt:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ihre Wahl? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2465,19 +2423,19 @@ msgstr ""
 "da sie älter sind als die Installierten:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
 msgstr ""
-"Die folgende Pakete können nicht installiert werden, wegen der Abhänigkeiten\n"
+"Die folgende Pakete können nicht installiert werden, wegen der "
+"Abhänigkeiten\n"
 "da sie älter sind als die Installierten:\n"
 "%s"
 
-#: ../urpmi:503
-#: ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2486,15 +2444,12 @@ msgstr ""
 "\n"
 "Wollen Sie trotzdem fortfahren?"
 
-#: ../urpmi:504
-#: ../urpmi:519
-#: ../urpmi:613
-#: ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2503,7 +2458,7 @@ msgstr ""
 "Das gewünschte Paket kann nicht installiert werden:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2512,12 +2467,12 @@ msgstr ""
 "Einige der gewünschten Pakete können nicht installiert werden:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2529,7 +2484,7 @@ msgstr ""
 "durchführen zu können:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2541,60 +2496,62 @@ msgstr ""
 "durchführen zu können:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(nur ein Test, das Entfernen wird nicht wirklich durchgeführt)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
-"Sie müssen urpmi zuerst mit der Option \"--buildrequires\" aufrufen, um die folgenden Abhängigkeiten zu installieren:\n"
+"Sie müssen urpmi zuerst mit der Option \"--buildrequires\" aufrufen, um die "
+"folgenden Abhängigkeiten zu installieren:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Das folgende verwaiste Paket wird entfernt"
 msgstr[1] "Die folgenden verwaisten Pakete werden entfernt"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(nur ein Test, es wird keine wirkliche Installation durchgeführt)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s zusätzlicher Speicher wird benötigt"
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s Speicher werden frei werden."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s an Paketen wird geholt"
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Fortfahren mit der Installation von einem Pakete?"
 msgstr[1] "Fortfahren mit der Installation der %d Pakete?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Betätigen Sie die Eingabetaste, wenn das Gerät eingebunden ist..."
@@ -2632,7 +2589,8 @@ msgstr ""
 "       cdrom://<path>\n"
 "\n"
 "Verwende: urpmi.addmedia [Optionen] --distrib --mirrorlist <url>\n"
-"Verwende: urpmi.addmedia [Optionen] --mirrorlist <url> <Name> <relativer Pfad>\n"
+"Verwende: urpmi.addmedia [Optionen] --mirrorlist <url> <Name> <relativer "
+"Pfad>\n"
 "\n"
 "Beispiele:\n"
 "\n"
@@ -2642,29 +2600,22 @@ msgstr ""
 "\n"
 "und [Optionen] aus\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - Benutze wget um entfernte Dateien zu laden.\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - Benutze curl um entfernte Dateien zu laden.\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - Benutze prozilla um entfernte Dateien zu laden.\n"
 
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
 #, fuzzy, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --aria2         - Benutze aria2 um entfernte Dateien zu laden.\n"
@@ -2674,13 +2625,14 @@ msgstr "  --aria2         - Benutze aria2 um entfernte Dateien zu laden.\n"
 msgid ""
 "  --update       - create an update medium, \n"
 "                   or discard non-update media (when used with --distrib)\n"
-msgstr "  --update	  - erstelle ein Update Medium, \n"
+msgstr "  --update\t  - erstelle ein Update Medium, \n"
 
 #: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
 
 #: ../urpmi.addmedia:69
@@ -2691,12 +2643,14 @@ msgstr "  --probe-synthesis - Versuche Synthese-Datei zu nutzen.\n"
 #: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
-msgstr "  --probe-rpms   - verwende RPM Dateien (anstelle von synthesis/hdlist).\n"
+msgstr ""
+"  --probe-rpms   - verwende RPM Dateien (anstelle von synthesis/hdlist).\n"
 
 #: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
-msgstr "  --no-probe     - versuche keine Synthese-Datei oder HD-Liste zu finden.\n"
+msgstr ""
+"  --no-probe     - versuche keine Synthese-Datei oder HD-Liste zu finden.\n"
 
 #: ../urpmi.addmedia:73
 #, c-format
@@ -2710,7 +2664,9 @@ msgstr ""
 #: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  - mit --distrib, fragt bei jedem Medium nach einer Bestätigung\n"
+msgstr ""
+"  --interactive  - mit --distrib, fragt bei jedem Medium nach einer "
+"Bestätigung\n"
 
 #: ../urpmi.addmedia:76
 #, c-format
@@ -2723,7 +2679,8 @@ msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
-"  --from         - nutze spezifizierte URL als Spiegelserverliste, die Vorgabe ist\n"
+"  --from         - nutze spezifizierte URL als Spiegelserverliste, die "
+"Vorgabe ist\n"
 "                   %s\n"
 
 #: ../urpmi.addmedia:79
@@ -2733,8 +2690,7 @@ msgstr ""
 "  --virtual      - erstelle virtuelle Medien, welche immer aktuell sind,\n"
 "                   nur das file:// Protokoll ist erlaubt.\n"
 
-#: ../urpmi.addmedia:80
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deaktiviere MD5SUM Dateiüberprüfung.\n"
@@ -2742,23 +2698,22 @@ msgstr "  --no-md5sum    - deaktiviere MD5SUM Dateiüberprüfung.\n"
 #: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
-msgstr "  --nopubkey     - den Pubkey vom hinzugefügten Medium nicht importieren\n"
+msgstr ""
+"  --nopubkey     - den Pubkey vom hinzugefügten Medium nicht importieren\n"
 
 #: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - Medien zur Konfiguration hinzufügen ohne sie zu aktualisieren.\n"
+msgstr ""
+"  --raw          - Medien zur Konfiguration hinzufügen ohne sie zu "
+"aktualisieren.\n"
 
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stiller Modus.\n"
 
-#: ../urpmi.addmedia:84
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ausführlicher Modus.\n"
@@ -2776,7 +2731,8 @@ msgstr ""
 #: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "Fehler in der <url> (für das Lokale Verzeichnis, der Pfad muss absolut sein)"
+msgstr ""
+"Fehler in der <url> (für das Lokale Verzeichnis, der Pfad muss absolut sein)"
 
 #: ../urpmi.addmedia:124
 #, c-format
@@ -2796,7 +2752,8 @@ msgstr "Kann Konfigurationsdatei [%s] nicht erzeugen"
 #: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
+msgstr ""
+"nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
 
 #: ../urpmi.addmedia:144
 #, c-format
@@ -2827,7 +2784,8 @@ msgstr "Es ist nicht möglich das Medium hinzuzufügen"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2850,18 +2808,23 @@ msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
-msgstr "  --list         - führt alles Transaktionen seit dem Datum/Argument auf\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
+msgstr ""
+"  --list         - führt alles Transaktionen seit dem Datum/Argument auf\n"
 
 #: ../urpmi.recover:38
 #, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - listet alle Transaktionen in der rpmdb auf (lang).\n"
+msgstr ""
+"  --list-all     - listet alle Transaktionen in der rpmdb auf (lang).\n"
 
 #: ../urpmi.recover:39
 #, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
-msgstr "  --list-safe    - listet die Transaktionen seit dem letzten Wiederherstellungspunkt auf.\n"
+msgstr ""
+"  --list-safe    - listet die Transaktionen seit dem letzten "
+"Wiederherstellungspunkt auf.\n"
 
 #: ../urpmi.recover:40
 #, c-format
@@ -2912,17 +2875,23 @@ msgstr "Falsches Kommandozeilen Argument [%s]\n"
 #: ../urpmi.recover:84
 #, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Es ist nicht möglich festzulegen --checkpoint und --rollback zur selben Zeit zu verwenden\n"
+msgstr ""
+"Es ist nicht möglich festzulegen --checkpoint und --rollback zur selben Zeit "
+"zu verwenden\n"
 
 #: ../urpmi.recover:86
 #, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "Es ist nicht möglich festzulegen --checkpoint und --list zur selben Zeit zu verwenden\n"
+msgstr ""
+"Es ist nicht möglich festzulegen --checkpoint und --list zur selben Zeit zu "
+"verwenden\n"
 
 #: ../urpmi.recover:88
 #, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
-msgstr "Es ist nicht möglich festzulegen --rollback und --list zur selben Zeit zu verwenden\n"
+msgstr ""
+"Es ist nicht möglich festzulegen --rollback und --list zur selben Zeit zu "
+"verwenden\n"
 
 #: ../urpmi.recover:90
 #, c-format
@@ -2939,8 +2908,7 @@ msgstr "Keine Transaktion seit %s gefunden\n"
 msgid "You must be superuser to do this"
 msgstr "Superuser Rechte sind dafür nötig"
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Schreiben des RPM macro file [%s]...\n"
@@ -3022,17 +2990,21 @@ msgstr "  --force-key    - erzwinge Update auf gpg Schlüssel.\n"
 #: ../urpmi.update:46
 #, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
-msgstr "  --ignore       - nicht aktualisieren, markiere die Medien als ignoriert.\n"
+msgstr ""
+"  --ignore       - nicht aktualisieren, markiere die Medien als ignoriert.\n"
 
 #: ../urpmi.update:47
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr "  --no-ignore    - nicht aktualisieren, markiere die Medien als aktiv.\n"
+msgstr ""
+"  --no-ignore    - nicht aktualisieren, markiere die Medien als aktiv.\n"
 
 #: ../urpmi.update:49
 #, fuzzy, c-format
 msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
-msgstr "  --probe-rpms   - verwenden Sie keine synthesis/hlist, verwenden Sie rpm Dateien direkt\n"
+msgstr ""
+"  --probe-rpms   - verwenden Sie keine synthesis/hlist, verwenden Sie rpm "
+"Dateien direkt\n"
 
 #: ../urpmi.update:50
 #, c-format
@@ -3054,14 +3026,14 @@ msgstr "  -f             - Erzwinge das Updaten von synthesis/hdlist\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Nur der Systemadministrator darf Medien aktualisieren"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Es gibt nichts zu aktualisieren (verwenden Sie \"urpmi.addmedia\", \n"
 "um neue Medien hinzuzufügen)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3070,17 +3042,17 @@ msgstr ""
 "Was soll aktualisiert werden?\n"
 "(eins aus %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignoriere Medium %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "Aktiviere das Medium %s"
@@ -3090,20 +3062,26 @@ msgstr "Aktiviere das Medium %s"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter vertrieben werden.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
+"vertrieben werden.\n"
 "\n"
 "Verwendung:\n"
 
 #: ../urpmq:48
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
-msgstr "  --searchmedia  - verwende nur die gegebenen Medien um nach der angeforderten Paketen zu suchen (oder upzudaten).\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+"  --searchmedia  - verwende nur die gegebenen Medien um nach der "
+"angeforderten Paketen zu suchen (oder upzudaten).\n"
 
 #: ../urpmq:53
 #, c-format
@@ -3144,8 +3122,11 @@ msgstr "  --list-aliases  - Alle verfügbaren Aliase auflisten.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - verwerfe die Konfiguration in der Form eines urpmi.addmedia Argumentes.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - verwerfe die Konfiguration in der Form eines urpmi."
+"addmedia Argumentes.\n"
 
 #: ../urpmq:64
 #, c-format
@@ -3154,7 +3135,8 @@ msgstr "  --src          - es folgt ein Quellpaket (identisch zu \"-s\").\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - Gib alle Quellpakete vor dem Runterladen an (nur root).\n"
 ".\n"
@@ -3162,7 +3144,9 @@ msgstr ""
 #: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - erlaubt die Abfrage von RPMs für     andere Architekturen\n"
+msgstr ""
+"  --ignorearch   - erlaubt die Abfrage von RPMs für     andere "
+"Architekturen\n"
 
 #: ../urpmq:71
 #, c-format
@@ -3234,7 +3218,8 @@ msgid ""
 "                   - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  --whatrequires-recursive\n"
-"                 - erweiterte umgekehrte Suche (beinhaltet virtuelle Pakete).\n"
+"                 - erweiterte umgekehrte Suche (beinhaltet virtuelle "
+"Pakete).\n"
 
 #: ../urpmq:95
 #, c-format
@@ -3258,7 +3243,8 @@ msgstr "  -g             - Ausgabe der Gruppe mit dem Namen.\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - Ausgabe von nützlichen Informationen in lesbarer Form.\n"
+msgstr ""
+"  -i             - Ausgabe von nützlichen Informationen in lesbarer Form.\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3282,23 +3268,32 @@ msgstr "  -s             - es folgt ein Quellpaket (identisch zu \"--src\").\n"
 
 #: ../urpmq:106
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -u             - Entferne Paket wenn bereits eine aktuellere Version installiert ist.\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - Entferne Paket wenn bereits eine aktuellere Version "
+"installiert ist.\n"
 
 #: ../urpmq:107
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - unscharfe Suche erzwingen (identisch zu \"--fuzzy\").\n"
+msgstr ""
+"  -y             - unscharfe Suche erzwingen (identisch zu \"--fuzzy\").\n"
 
 #: ../urpmq:108
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             - wie -y, aber erzwingt eine großschreibungsunabhängige Schreibweise.\n"
+msgstr ""
+"  -Y             - wie -y, aber erzwingt eine großschreibungsunabhängige "
+"Schreibweise.\n"
 
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  Namen oder RPM-Dateien, die auf der Kommandozeile angegeben wurden, werden abgefragt.\n"
+msgstr ""
+"  Namen oder RPM-Dateien, die auf der Kommandozeile angegeben wurden, werden "
+"abgefragt.\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3318,26 +3313,35 @@ msgstr "nutze -l um die Dateien zu aufzulisten"
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "Keine xml info für das Medium \"%s\", nur Teilresultate für das Paket %s"
+msgstr ""
+"Keine xml info für das Medium \"%s\", nur Teilresultate für das Paket %s"
 
 #: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "Keine xml info für das Medium \"%s\", nur Teilresultate für die Pakete %s"
+msgstr ""
+"Keine xml info für das Medium \"%s\", nur Teilresultate für die Pakete %s"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "Keine xml info für das Medium \"%s\", es ist nicht möglich ein Ergebnis für das Paket %s zu liefern"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"Keine xml info für das Medium \"%s\", es ist nicht möglich ein Ergebnis für "
+"das Paket %s zu liefern"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "Keine xml info für das Medium \"%s\", es ist nicht möglich Ergebnisse für die Pakete %s zu liefern"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Keine xml info für das Medium \"%s\", es ist nicht möglich Ergebnisse für "
+"die Pakete %s zu liefern"
 
 #: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "Kein Changelog gefunden\n"
 
-
+#~ msgid "Updating media...\n"
+#~ msgstr "Aktualisiere Medien...\n"
diff --git a/po/el.po b/po/el.po
index a30844ac..3e13c56f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2009-02-15 11:16+0100\n"
 "Last-Translator: Glentadakis Dimitrios <dglent@gmail.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -30,32 +30,30 @@ msgstr ""
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,519,-1\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../gurpmi:31
-#: ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Εγκατάσταση των RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Σφάλμα: αδυναμία εύρεσης του αρχείου %s, η διαδικασία θα ακυρωθεί"
 
-#: ../gurpmi:46
-#: ../gurpmi2:174
-#: ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Εντάξει"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -63,12 +61,13 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Πιθανόν δεν θέλατε να το εγκαταστήσετε στον υπολογιστή σας (η εγκατάστασή του θα σας επιτρέψει να κάνετε τροποποιήσεις στον πηγαίου του κώδικα και μετά να το μεταγλωττίσετε).\n"
+"Πιθανόν δεν θέλατε να το εγκαταστήσετε στον υπολογιστή σας (η εγκατάστασή "
+"του θα σας επιτρέψει να κάνετε τροποποιήσεις στον πηγαίου του κώδικα και "
+"μετά να το μεταγλωττίσετε).\n"
 "\n"
 "Τι θέλετε να κάνετε;"
 
-#: ../gurpmi:74
-#: ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -77,13 +76,14 @@ msgid ""
 "\n"
 "Proceed?"
 msgstr ""
-"Πρόκειται να εγκαταστήσετε τα ακόλουθα πακέτα λογισμικού στον υπολογιστή σας:\n"
+"Πρόκειται να εγκαταστήσετε τα ακόλουθα πακέτα λογισμικού στον υπολογιστή "
+"σας:\n"
 "\n"
 "%s\n"
 " \n"
 "Να συνεχίσω;"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -92,46 +92,47 @@ msgid ""
 "\n"
 "You may prefer to just save it. What is your choice?"
 msgstr ""
-"Πρόκειται να να εγκαταστήσετε το ακόλουθο πακέτο λογισμικού στον υπολογιστή σας:\n"
+"Πρόκειται να να εγκαταστήσετε το ακόλουθο πακέτο λογισμικού στον υπολογιστή "
+"σας:\n"
 "\n"
 "%s\n"
 "\n"
 "Μπορεί να προτιμάτε απλά να το αποθηκεύσετε. Ποια είναι η επιλογή σας;"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Εγκατάσταση"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Αποθήκευση"
 
-#: ../gurpmi:100
-#: ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Επιλέξτε μια τοποθεσία για την αποθήκευση του αρχείου"
 
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
 #, c-format
 msgid ""
 "urpmi 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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpm έκδοση  %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
 "\n"
 "χρήση:\n"
 
@@ -140,100 +141,102 @@ 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 ../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 "  --help         - τύπωσε αυτό το μήνυμα βοήθειας.\n"
 
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
-msgstr "  --auto         - μη αλληλεπιδραστική λειτουργία, χρήση των προεπιλεγμένων παραμέτρων.\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+"  --auto         - μη αλληλεπιδραστική λειτουργία, χρήση των προεπιλεγμένων "
+"παραμέτρων.\n"
 
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - αυτόματη επιλογή των πακέτων για την αναβάθμιση του συστήματος.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - αυτόματη επιλογή των πακέτων για την αναβάθμιση του "
+"συστήματος.\n"
 
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - εξαναγκασμός επίκλησης ακόμα και εάν μερικά πακέτα δεν υπάρχουν.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - εξαναγκασμός επίκλησης ακόμα και εάν μερικά πακέτα δεν "
+"υπάρχουν.\n"
 
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 "  --verify-rpm   - έλεγχος της υπογραφής του rpm πριν την εγκατάσταση\n"
-"                   (--no-verify-rpm για απενεργοποίηση, ενεργοποιημένο από προεπιλογή).\n"
+"                   (--no-verify-rpm για απενεργοποίηση, ενεργοποιημένο από "
+"προεπιλογή).\n"
 
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - χρήση μόνο των μέσων που δόθηκαν, διαχωρισμένα με το κόμμα.\n"
+msgstr ""
+"  --media        - χρήση μόνο των μέσων που δόθηκαν, διαχωρισμένα με το "
+"κόμμα.\n"
 
-#: ../gurpmi.pm:53
-#: ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - να επιτρέπεται η αναζήτηση εντός των πακέτων, για να βρεθεί το κατάλληλο πακέτο.\n"
+msgstr ""
+"  -p             - να επιτρέπεται η αναζήτηση εντός των πακέτων, για να "
+"βρεθεί το κατάλληλο πακέτο.\n"
 
-#: ../gurpmi.pm:54
-#: ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - να μην επιτρέπεται η αναζήτηση εντός των πακέτων, για να βρεθεί το κατάλληλο πακέτο.\n"
+msgstr ""
+"  -P             - να μην επιτρέπεται η αναζήτηση εντός των πακέτων, για να "
+"βρεθεί το κατάλληλο πακέτο.\n"
 
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - χρησιμοποίησε μία άλλη διαδρομή root για την εγκατάσταση του rpm.\n"
+msgstr ""
+"  --root         - χρησιμοποίησε μία άλλη διαδρομή root για την εγκατάσταση "
+"του rpm.\n"
 
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - έλεγξε μόνο αν η εγκατάσταση μπορεί να γίνει σωστά.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+"  --test         - έλεγξε μόνο αν η εγκατάσταση μπορεί να γίνει σωστά.\n"
 
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr "  --searchmedia  - χρήση μόνο των δοσμένων μέσων για την αναζήτηση των ζητούμενων πακέτων.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr ""
+"  --searchmedia  - χρήση μόνο των δοσμένων μέσων για την αναζήτηση των "
+"ζητούμενων πακέτων.\n"
 
 #: ../gurpmi.pm:100
 #, c-format
 msgid "No packages specified"
 msgstr "Δεν ορίστηκαν πακέτα"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Παρακαλώ περιμένετε..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Πρέπει να είστε διαχειριστής"
@@ -264,43 +267,42 @@ msgstr ""
 "%s\n"
 "Συνέχιση της εγκατάστασης ;"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: ../gurpmi2:134
-#: ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Εντάξει"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (προς αναβάθμιση)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (προς εγκατάσταση)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Επιλογή πακέτων"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Ματαίωση"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -311,60 +313,65 @@ msgstr ""
 "%s\n"
 "Συνέχεια εγκατάστασης;"
 
-#: ../gurpmi2:240
-#: ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθεί το παρακάτω πακέτο:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθεί το παρακάτω πακέτο:"
 
-#: ../gurpmi2:241
-#: ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθούν τα ακόλουθα πακέτα:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθούν τα ακόλουθα πακέτα:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d πακέτο, %d MB)"
 msgstr[1] "(%d πακέτα, %d MB)"
 
-#: ../gurpmi2:257
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "αδυναμία λήψης των πακέτων πηγαίου κώδικα, ματαίωση"
 
-#: ../gurpmi2:265
-#: ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Προετοιμασία..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Εγκατάσταση του πακέτου `%s' (%s/%s)..."
 
-#: ../gurpmi2:286
-#: ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Παρακαλώ εισήγαγε το μέσο με το όνομα «%s»"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Λήψη του πακέτου `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... η ανάκτηση απέτυχε: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Ολοκληρώθηκε"
 
-#: ../gurpmi2:331
-#: ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -375,33 +382,27 @@ msgstr ""
 "%s\n"
 "Θα πρέπει να ενημερώσετε τη βάση δεδομένων urpmi"
 
-#: ../gurpmi2:337
-#: ../urpm/main_loop.pm:226
-#: ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262
-#: ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Η εγκατάσταση απέτυχε:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Η εγκατάσταση τελείωσε"
 
-#: ../gurpmi2:345
-#: ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "αφαίρεση του %s"
 
-#: ../gurpmi2:353
-#: ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "Επανεκκίνηση urpmi"
@@ -423,7 +424,8 @@ msgstr "   -h|--help      - τύπωσε αυτό το μήνυμα βοήθει
 #: ../rpm-find-leaves:18
 #, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
-msgstr "   --root <path>  - χρήση της root διαδρομής που δόθηκε αντί για την /\n"
+msgstr ""
+"   --root <path>  - χρήση της root διαδρομής που δόθηκε αντί για την /\n"
 
 #: ../rpm-find-leaves:19
 #, c-format
@@ -440,8 +442,7 @@ msgstr "                    προκαθορισμένο είναι το %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - εμφανίζει το πλήρες όνομα του πακέτου (NVRA)\n"
 
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να εγκαταστήσει πακέτα"
@@ -471,76 +472,64 @@ msgstr "Αδυναμία λήψης του πακέτου, στο %s"
 msgid "Environment directory %s does not exist"
 msgstr "Ο κατάλογος του περιβάλλοντος %s δεν υπάρχει"
 
-#: ../urpm.pm:141
-#: ../urpmf:248
-#: ../urpmq:165
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "χρήση συγκεκριμένου περιβάλλοντος στο %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "αδυναμία ανοίγματος του rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "μη έγκυρο όνομα αρχείου rpm [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "ανάκτηση αρχείου rpm [%s] ..."
 
-#: ../urpm.pm:327
-#: ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...η ανάκτηση ολοκληρώθηκε"
 
-#: ../urpm.pm:330
-#: ../urpm/download.pm:777
-#: ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830
-#: ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... η ανάκτηση απέτυχε: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "αδυναμία πρόσβασης στο αρχείο rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "αδυναμία ανάλυσης του αρχείου spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "αδυναμία δήλωσης του αρχείου rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Ασύμβατη αρχιτεκτονική για τα rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "σφάλμα κατά την δήλωση των τοπικών πακέτων"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
-msgstr "Αυτή η λειτουργία απαγορεύεται να εκτελεστεί, όταν ισχύει κατάσταση περιορισμένης λειτουργίας"
+msgstr ""
+"Αυτή η λειτουργία απαγορεύεται να εκτελεστεί, όταν ισχύει κατάσταση "
+"περιορισμένης λειτουργίας"
 
-#: ../urpm/args.pm:152
-#: ../urpm/args.pm:161
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "μη ορθή διακήρυξη proxy στην γραμμή εντολών\n"
@@ -573,48 +562,50 @@ msgstr "δεν υπάρχει έκφραση για να τερματιστεί"
 #: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "από προεπιλογή η urpmf αναμένει μια regexp. Θα πρέπει να χρησιμοποιήσετε την επιλογή \"--literal\""
+msgstr ""
+"από προεπιλογή η urpmf αναμένει μια regexp. Θα πρέπει να χρησιμοποιήσετε την "
+"επιλογή \"--literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "ο κατάλογος chroot δεν υπάρχει"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Αδύνατη η χρήση του %s χωρίς το %s"
 
-#: ../urpm/args.pm:497
-#: ../urpm/args.pm:500
-#: ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Αδύνατη η χρήση του %s με το %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Πάρα πολλά ορίσματα\n"
 
-#: ../urpm/bug_report.pm:54
-#: ../urpmi:259
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Η αντιγραφή απέτυχε"
 
 #: ../urpm/cdrom.pm:66
 #, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Πρέπει να προσαρτήσεις το CD-ROM από μόνος σου (ή να εγκαταστήσεις το perl-Hal-Cdroms ώστε αυτό να γίνεται αυτόματα)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Πρέπει να προσαρτήσεις το CD-ROM από μόνος σου (ή να εγκαταστήσεις το perl-"
+"Hal-Cdroms ώστε αυτό να γίνεται αυτόματα)"
 
 #: ../urpm/cdrom.pm:68
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "Ο δαίμονας HAL (hald) δεν εκτελείται ή δεν είναι έτοιμος"
 
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "το μέσο \"%s\" δεν είναι διαθέσιμο"
@@ -639,9 +630,7 @@ msgstr "αδυναμία ανάγνωσης του αρχείου ρυθμίσε
 msgid "medium `%s' is defined twice, aborting"
 msgstr "το μέσο `%s' προσδιορίστηκε δύο φορές, γίνεται εγκατάλειψη"
 
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:497
-#: ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "αδυναμία εγγραφής του αρχείου ρυθμίσεων [%s]"
@@ -654,7 +643,9 @@ msgstr "το %s δεν είναι διαθέσιμο, επιστροφή στη
 #: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "αδυναμία ανάγνωσης των ρυθμίσεων του proxy (διαμεσολαβητής) (τα δικαιώματα δεν είναι επαρκή για την ανάγνωση του %s)"
+msgstr ""
+"αδυναμία ανάγνωσης των ρυθμίσεων του proxy (διαμεσολαβητής) (τα δικαιώματα "
+"δεν είναι επαρκή για την ανάγνωση του %s)"
 
 #: ../urpm/download.pm:182
 #, c-format
@@ -686,82 +677,87 @@ msgstr "το %s απέτυχε: έγινε έξοδος με το σήμα %d"
 msgid "%s failed: exited with %d"
 msgstr "το %s απέτυχε: έγινε έξοδος με %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "αποτυχία αντιγραφής"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "λείπει το wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "λείπει το curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "το curl απέτυχε: ακύρωση της λήψης\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "λείπει το rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "λείπει το ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "λείπει το prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Αδυναμία εκτέλεσης του prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "λείπει το aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        ολοκληρώθηκε το %s%% από τα %s, εκτίμηση = %s, ταχύτητα = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        ολοκληρώθηκε το %s%%, ταχύτητα = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "ανάκτηση %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "ανακτήθηκε %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "καθορίστηκε άγνωστο πρωτόκολλο για το %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "δεν βρέθηκε το webfetch, υποστηριζόμενα webfetch είναι: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "αδυναμία χειρισμού πρωτοκόλλου: %s"
@@ -781,58 +777,60 @@ msgstr "το πακέτο %s δεν βρέθηκε."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ανάκτηση αρχείων rpm από το μέσο \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[επαναπακετάρισμα]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "δημιουργήθηκε transaction για εγκατάσταση στο %s (αφαίρεση=%d, εγκατάσταση=%d, αναβάθμιση=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"δημιουργήθηκε transaction για εγκατάσταση στο %s (αφαίρεση=%d, εγκατάσταση=%"
+"d, αναβάθμιση=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "Αδυναμία δημιουργίας transaction"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "αδυναμία εξαγωγής rpm από το πακέτο delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "αδυναμία εγκατάστασης του πακέτου %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "αφαίρεση του κακοδιατυπομένου rpm (%s) από το %s"
 
-#: ../urpm/install.pm:212
-#: ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "η αφαίρεση του %s απέτυχε: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Αφαίρεση του πακέτου %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "αφαίρεση του πακέτου %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "αφαίρεση των εγκατεστημένων rpm (%s) από το %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Περισσότερες πληροφορίες στο πακέτο %s"
@@ -857,8 +855,7 @@ msgstr "Δεν προσδιορίστηκε εξυπηρετητής, λείπε
 msgid "No base defined"
 msgstr "Δεν ορίστηκε βάση"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Αδυναμία σύνδεσης στο ldap uri:"
@@ -876,24 +873,26 @@ msgstr "εγκατάλειψη"
 #: ../urpm/lock.pm:65
 #, c-format
 msgid "%s database is locked (another program is already using it)"
-msgstr "η βάση δεδομένων %s είναι κλειδωμένη (ένα άλλο πρόγραμμα τη χρησιμοποιεί ήδη)"
+msgstr ""
+"η βάση δεδομένων %s είναι κλειδωμένη (ένα άλλο πρόγραμμα τη χρησιμοποιεί ήδη)"
+
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
 
-#: ../urpm/main_loop.pm:113
-#: ../urpm/main_loop.pm:123
-#: ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233
-#: ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../urpm/main_loop.pm:115
-#: ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Να προσπαθήσω να συνεχίσω, έτσι κι αλλιώς; (y/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -902,58 +901,57 @@ msgstr ""
 "Η εγκατάσταση απέτυχε. Εσφαλμένα rpm:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Το παρακάτω πακέτο έχει λανθασμένη υπογραφή"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Τα παρακάτω πακέτα έχουν λανθασμένες υπογραφές"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Θέλετε να συνεχίσετε την εγκατάσταση ;"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "αφαίρεση των εγκατεστημένων rpm (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "κατανομή %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "εγκατάσταση %s από %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "εγκατάσταση %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Προσπάθεια για εγκατάσταση, χωρίς τον έλεγχο των εξαρτήσεων; (y/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Προσπάθεια για εξαναγκαστική εγκατάσταση (--force); (y/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Τα πακέτα είναι ενημερωμένα"
 
-#: ../urpm/main_loop.pm:313
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Η εγκατάσταση είναι δυνατή"
@@ -966,7 +964,9 @@ msgstr "προειδοποίηση: μη διαθέσιμο md5sum για %s σ�
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "το εικονικό μέσο \"%s\" πρέπει να έχει ένα καθαρό σύνδεσμο url, το μέσο αγνοείται"
+msgstr ""
+"το εικονικό μέσο \"%s\" πρέπει να έχει ένα καθαρό σύνδεσμο url, το μέσο "
+"αγνοείται"
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -988,8 +988,7 @@ msgstr "προσπάθεια παράκαμψης του υπάρχοντος μ
 msgid "failed to migrate removable device, ignoring media"
 msgstr "σφάλμα στην εισαγωγή της αφαιρούμενης συσκευής, το μέσο θα αγνοηθεί"
 
-#: ../urpm/media.pm:499
-#: ../urpm/media.pm:505
+#: ../urpm/media.pm:499 ../urpm/media.pm:505
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "εγγραφή αρχείου ρυθμίσεων [%s]"
@@ -997,7 +996,8 @@ msgstr "εγγραφή αρχείου ρυθμίσεων [%s]"
 #: ../urpm/media.pm:548
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Δεν μπορεί να χρησιμοποιηθεί παράλληλη κατάσταση με use-distrib κατάσταση"
+msgstr ""
+"Δεν μπορεί να χρησιμοποιηθεί παράλληλη κατάσταση με use-distrib κατάσταση"
 
 #: ../urpm/media.pm:556
 #, c-format
@@ -1006,8 +1006,12 @@ msgstr "χρήση του συσχετισμένου μέσου για παρά�
 
 #: ../urpm/media.pm:572
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis δεν μπορεί να χρησιμοποιηθεί μαζί με --media, --excludemedia, --sortmedia, --update, --use-distrib ή --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis δεν μπορεί να χρησιμοποιηθεί μαζί με --media, --excludemedia, --"
+"sortmedia, --update, --use-distrib ή --parallel"
 
 #: ../urpm/media.pm:666
 #, c-format
@@ -1124,15 +1128,12 @@ msgstr "εξέταση του αρχείου σύνθεσης [%s]"
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "πρόβλημα ανάγνωσης του αρχείου σύνθεσης από το μέσο \"%s\""
 
-#: ../urpm/media.pm:1168
-#: ../urpm/media.pm:1263
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "αντιγραφή [%s] για το μέσο \"%s\"..."
 
-#: ../urpm/media.pm:1170
-#: ../urpm/media.pm:1240
-#: ../urpm/media.pm:1493
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
 #, c-format
 msgid "...copying failed"
 msgstr "...η αντιγραφή απέτυχε"
@@ -1142,8 +1143,7 @@ msgstr "...η αντιγραφή απέτυχε"
 msgid "copying description file of \"%s\"..."
 msgstr "αντιγραφή του αρχείου περιγραφής του \"%s\"..."
 
-#: ../urpm/media.pm:1238
-#: ../urpm/media.pm:1267
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...η αντιγραφή ολοκληρώθηκε"
@@ -1158,8 +1158,7 @@ msgstr "η αντιγραφή του [%s] απέτυχε (το αρχείο εί
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "υπολογισμός του md5sum του ανακτημένου πηγαίου synthesis"
 
-#: ../urpm/media.pm:1319
-#: ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "η ανάκτηση του [%s] απέτυχε (τα md5sum δεν ταιριάζουν)"
@@ -1199,38 +1198,37 @@ msgstr "δεν βρέθηκαν μεταδεδομένα για το μέσο \"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "ανάκτηση της πηγαίας synthesis από το \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Εξέταση του αρχείου δημοσίου κλειδιού από το \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...εισαγωγή του κλειδιού %s από το αρχείο δημοσίου κλειδιού του \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "αδυναμία εισαγωγής του αρχείου δημοσίου κλειδιού του \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "δεν βρέθηκε αρχείο synthesis για το μέσο \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "ενημερώθηκε το μέσο \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "αποτυχία ανάκτησης του [%s]"
 
-#: ../urpm/mirrors.pm:19
-#: ../urpm/mirrors.pm:40
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
 #, c-format
 msgid "trying again with mirror %s"
 msgstr "γίνεται προσπάθεια ξανά με την εναλλακτική διεύθυνση %s"
@@ -1238,109 +1236,116 @@ msgstr "γίνεται προσπάθεια ξανά με την εναλλακ�
 #: ../urpm/mirrors.pm:92
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
-msgstr "Αδυναμία εύρεσης μιας εναλλακτικής διεύθυνσης από τη λίστα των εναλλακτικών διευθύνσεων %s"
+msgstr ""
+"Αδυναμία εύρεσης μιας εναλλακτικής διεύθυνσης από τη λίστα των εναλλακτικών "
+"διευθύνσεων %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "βρέθηκε η γεωτοποθεσία %s %.2f %.2f από την ζώνη ώρας %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "λήψη της λίστας των εναλλακτικών διευθύνσεων από το %s"
 
-#: ../urpm/msg.pm:63
-#: ../urpmi:502
-#: ../urpmi:517
-#: ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "ΟοNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:553
-#: ../urpmi:648
-#: ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ΝνYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Λυπάμαι, κακή επιλογή, προσπαθήστε ξανά\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Πακέτο"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Έκδοση"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Κυκλοφορία"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Αρχιτεκ."
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(προτεινόμενα)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "μέσο \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "γραμμή εντολών"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "Το παρακάτω πακέτο είναι, πλέον, ορφανό. Για να το αφαιρέσεις, χρησιμοποίησε την εντολή \"urpme --auto-orphans\" ."
-msgstr[1] "Τα παρακάτω πακέτα είναι, πλέον, ορφανά. Για να τα αφαιρέσεις, χρησιμοποίησε την εντολή \"urpme --auto-orphans\" ."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"Το παρακάτω πακέτο είναι, πλέον, ορφανό. Για να το αφαιρέσεις, χρησιμοποίησε "
+"την εντολή \"urpme --auto-orphans\" ."
+msgstr[1] ""
+"Τα παρακάτω πακέτα είναι, πλέον, ορφανά. Για να τα αφαιρέσεις, χρησιμοποίησε "
+"την εντολή \"urpme --auto-orphans\" ."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1394,16 +1399,19 @@ msgstr "απέτυχε το cp, στον οικοδεσπότη (host) %s (%d)"
 
 #: ../urpm/parallel_ssh.pm:86
 #, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "απέτυχε το %s, στον οικοδεσπότη (host) %s (μήπως δεν διαθέτει μια καλή έκδοση του urpmi;) (το αποτέλεσμα εξαγωγής του κώδικα: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"απέτυχε το %s, στον οικοδεσπότη (host) %s (μήπως δεν διαθέτει μια καλή "
+"έκδοση του urpmi;) (το αποτέλεσμα εξαγωγής του κώδικα: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "αδυναμία πρόσβασης στο μέσο \"%s\"."
 
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "προσάρτηση του %s"
@@ -1413,659 +1421,617 @@ msgstr "προσάρτηση του %s"
 msgid "unmounting %s"
 msgstr "αποπροσάρτηση του %s"
 
-#: ../urpm/search.pm:29
+#: ../urpm/select.pm:30
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας δεν έχει "
+"αλλάξει"
+
+#: ../urpm/select.pm:32
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας έχει "
+"αλλάξει: %s vs %s"
+
+#: ../urpm/select.pm:170
+#, c-format
+msgid "No package named %s"
+msgstr "Κανένα πακέτο με το όνομα %s"
+
+#: ../urpm/select.pm:172 ../urpme:117
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Τα παρακάτω πακέτα περιέχουν %s: %s"
+
+#: ../urpm/select.pm:174
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr "Θα πρέπει να χρησιμοποιήσεις \"-a\" για την επιλογή όλων"
+
+#: ../urpm/select.pm:294
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr ""
+"τα πακέτα %s βρέθηκαν στην βάση δεδομένων του urpmi, αλλά κανένα τους δεν "
+"είναι εγκατεστημένο"
+
+#: ../urpm/select.pm:537
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Το πακέτο %s είναι ήδη εγκατεστημένο"
+
+#: ../urpm/select.pm:538
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Τα πακέτα %s είναι ήδη εγκατεστημένα"
+
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#, c-format
+msgid "due to missing %s"
+msgstr "λόγω έλλειψης του %s"
+
+#: ../urpm/select.pm:557
+#, c-format
+msgid "due to already installed %s"
+msgstr "επειδή το %s είναι ήδη εγκατεστημένο"
+
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "λόγω μη ικανοποίησης του %s"
+
+#: ../urpm/select.pm:564
+#, c-format
+msgid "trying to promote %s"
+msgstr "προσπάθεια ενίσχυσης του %s"
+
+#: ../urpm/select.pm:565
+#, c-format
+msgid "in order to keep %s"
+msgstr "για να κρατηθεί το %s"
+
+#: ../urpm/select.pm:606
+#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Το παρακάτω πακέτο πρέπει να αφαιρεθεί για να αναβαθμιστούν κάποια άλλα:\n"
+"%s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
+"%s"
+
+#: ../urpm/select.pm:634
+#, c-format
+msgid "in order to install %s"
+msgstr "για να εγκατασταθεί το %s"
+
+#: ../urpm/select.pm:644
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "λόγω συγκρούσεων με το %s"
+
+#: ../urpm/signature.pm:32
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Μη έγκυρη υπογραφή (%s)"
+
+#: ../urpm/signature.pm:63
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Μη έγκυρο ID Κλειδιού (%s)"
+
+#: ../urpm/signature.pm:65
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Απουσία υπογραφής (%s)"
+
+#: ../urpm/sys.pm:178
+#, c-format
+msgid "system"
+msgstr "σύστημα"
+
+#: ../urpm/sys.pm:213
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Θα πρέπει να κάνεις επανεκκίνηση στο %s για το %s"
+
+#: ../urpm/sys.pm:316
+#, c-format
+msgid "Can't write file"
+msgstr "Αδυναμία εγγραφής του αρχείου"
+
+#: ../urpm/sys.pm:316
+#, c-format
+msgid "Can't open file"
+msgstr "Αδυναμία ανοίγματος του αρχείου"
+
+#: ../urpm/sys.pm:329
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Αδυναμία μετακίνησης του αρχείου %s στο %s"
+
+#: ../urpme:41
+#, 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"
+msgstr ""
+"urpme έκδοση %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
+"\n"
+"χρήση:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - αυτόματη επιλογή πακέτου κατ' επιλογήν.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - απομάκρυνση των ορφανών\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - επαλήθευση ότι η αφαίρεση μπορεί να επιτευχθεί σωστά.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - διανεμημένα urpmi κατά μήκος των μηχανών με ψευδώνυμα.\n"
+
+#: ../urpme:52 ../urpmi:142
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Ξανά-πακετάρισμα των αρχείων πριν την διαγραφή\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --root         - χρήση διαφορετικής διαδρομής root για την αφαίρεση rpm.\n"
+
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - χρήση μίας άλλης διαδρομής root για την βάση δεδομένων "
+"urpmi κ' την εγκατάσταση του rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - ενημέρωση της βάσης rpm αλλά όχι το σύστημα αρχείων.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - να μην εκτελεστούν τα scripts απεγκατάστασης.\n"
+
+#: ../urpme:57
+#, 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"
+msgstr ""
+"  --use-distrib  - ρύθμιση urpme απευθείας από ένα δέντρο διανομής, χρήσιμο\n"
+"                   για την (απ)εγκατάσταση ενός chroot με την --root "
+"επιλογή.\n"
+
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - αναλυτική λειτουργία.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - επιλογή όλων των πακέτων που ταιριάζουν με την έκφραση.\n"
+
+#: ../urpme:75
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφαιρέσει πακέτα"
+
+#: ../urpme:108
+#, c-format
+msgid "unknown packages"
+msgstr "άγνωστα πακέτα"
+
+#: ../urpme:108
+#, c-format
+msgid "unknown package"
+msgstr "άγνωστο πακέτο"
+
+#: ../urpme:123
+#, 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] "Η αφαίρεση των παρακάτω πακέτων θα καταστρέψει το σύστημά σου:"
+
+#: ../urpme:128
+#, c-format
+msgid "Nothing to remove"
+msgstr "Τίποτα προς αφαίρεση"
+
+#: ../urpme:145
+#, c-format
+msgid "No orphans to remove"
+msgstr "Δεν υπάρχουν ορφανά προς αφαίρεση"
+
+#: ../urpme:151
+#, 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] ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, θα αφαιρεθούν τα παρακάτω %d πακέτα"
+
+#: ../urpme:156
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "(ορφανό πακέτο)"
+msgstr[1] "(ορφανά πακέτα)"
+
+#: ../urpme:163
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Αφαίρεση %d πακέτου;"
+msgstr[1] "Αφαίρεση %d πακέτων;"
+
+#: ../urpme:168
+#, c-format
+msgid "testing removal of %s"
+msgstr "δοκιμαστική αφαίρεση του %s"
+
+#: ../urpme:185
+#, c-format
+msgid "Removal failed"
+msgstr "Η αφαίρεση απέτυχε"
+
+#: ../urpme:187
+#, c-format
+msgid "Removal is possible"
+msgstr "Η αφαίρεση είναι δυνατή"
+
 #: ../urpmf:29
 #, 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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
 " urpmf έκδοση %s\n"
 "Copyright (C) 2002-2006 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
 "\n"
-"χρήση: urpmf [επιλογές] ακολουθία-έκφραση ( urpmf [options] pattern-expression )\n"
+"χρήση: urpmf [επιλογές] ακολουθία-έκφραση ( urpmf [options] pattern-"
+"expression )\n"
 
-#: ../urpm/search.pm:36
 #: ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --έκδοση         - τύπωσε τον αριθμό έκδοσης αυτού του εργαλείου\n"
 
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - χρήση συγκεκριμένου περιβάλλοντος (τυπικά μία αναφορά\n"
 "                   σφάλματος).\n"
 
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - μην χρήση των μέσων που δόθηκαν, διαχωρισμένα με το κόμμα.\n"
+msgstr ""
+"  --excludemedia - μην χρήση των μέσων που δόθηκαν, διαχωρισμένα με το "
+"κόμμα.\n"
 
-#: ../urpm/search.pm:39
 #: ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - δεν αντικαθιστά τους μπαλαντέρ, εφαρμογή του ορίσματος ως έχει.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - χρήση μίας άλλης διαδρομής root για την βάση δεδομένων urpmi κ' την εγκατάσταση του rpm.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - δεν αντικαθιστά τους μπαλαντέρ, εφαρμογή του ορίσματος ως "
+"έχει.\n"
 
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --sortmedia    - ταξινόμηση μέσων σύμφωνα με τα τμήματα λεκτικών διαχωρισμένα\n"
+"  --sortmedia    - ταξινόμηση μέσων σύμφωνα με τα τμήματα λεκτικών "
+"διαχωρισμένα\n"
 "                   με το κόμμα.\n"
 
-#: ../urpm/search.pm:43
 #: ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - χρησιμοποιεί την καθορισμένη διαδρομή για πρόσβαση στο μέσο\n"
+msgstr ""
+"  --use-distrib  - χρησιμοποιεί την καθορισμένη διαδρομή για πρόσβαση στο "
+"μέσο\n"
 
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
+msgstr ""
+"  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
 
-#: ../urpm/search.pm:45
 #: ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - μην τυπώσεις πανομοιότυπες γραμμές.\n"
 
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης.\n"
 
-#: ../urpm/search.pm:47
 #: ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose             - αναλυτική λειτουργία.\n"
 
-#: ../urpm/search.pm:48
 #: ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i            - αγνόησε τη διάκριση πεζών-κεφαλαίων στις ακολουθίες.\n"
+msgstr ""
+"  -i            - αγνόησε τη διάκριση πεζών-κεφαλαίων στις ακολουθίες.\n"
 
-#: ../urpm/search.pm:49
 #: ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - να γίνει διάκριση πεζών-κεφαλαίων στις ακολουθίες (προεπιλογή).\n"
+msgstr ""
+"  -I             - να γίνει διάκριση πεζών-κεφαλαίων στις ακολουθίες "
+"(προεπιλογή).\n"
 
-#: ../urpm/search.pm:50
 #: ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - αντικαθιστά τον διαχωριστή με <str> (από προεπιλογή ':').\n"
+msgstr ""
+"  -F<str>        - αντικαθιστά τον διαχωριστή με <str> (από προεπιλογή "
+"':').\n"
 
-#: ../urpm/search.pm:51
 #: ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Ακολουθίες εκφράσεων:\n"
 
-#: ../urpm/search.pm:52
 #: ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "  text           - οποιοδήποτε κείμενο επεξεργάζεται σαν απλή έκφραση (regexp), εκτός αν έχει επιλεγεί το -l .\n"
+msgstr ""
+"  text           - οποιοδήποτε κείμενο επεξεργάζεται σαν απλή έκφραση "
+"(regexp), εκτός αν έχει επιλεγεί το -l .\n"
 
-#: ../urpm/search.pm:53
 #: ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - συμπεριέλαβε κώδικα perl απευθείας σαν perl -e.\n"
 
-#: ../urpm/search.pm:54
 #: ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - δυαδικός AND τελεστής.\n"
 
-#: ../urpm/search.pm:55
 #: ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -ο             - δυαδικός OR τελεστής.\n"
 
-#: ../urpm/search.pm:56
 #: ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - ΟΧΙ μοναδιαίο.\n"
 
-#: ../urpm/search.pm:57
 #: ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )             - αριστερή και δεξιά παρένθεση.\n"
 
-#: ../urpm/search.pm:58
 #: ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Κατάλογος ετικετών:\n"
 
-#: ../urpm/search.pm:59
 #: ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - καθορίζει την μορφή εμφάνισης του τύπου printf\n"
 
-#: ../urpm/search.pm:60
 #: ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    παράδειγμα: '%%name:%%files'\n"
 
-#: ../urpm/search.pm:61
 #: ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch        - αρχιτεκτονική\n"
 
-#: ../urpm/search.pm:62
 #: ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - αναζήτηση στο πεδίο « BuildHost »\n"
 
-#: ../urpm/search.pm:63
 #: ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - αναζήτηση στο πεδίο «BuildTime»\n"
 
-#: ../urpm/search.pm:64
 #: ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - αρχεία ρυθμίσεων\n"
 
-#: ../urpm/search.pm:65
 #: ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - ετικέτες συγκρούσεων\n"
 
-#: ../urpm/search.pm:66
 #: ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - αναζήτηση στην περιγραφή των πακέτων\n"
 
-#: ../urpm/search.pm:67
 #: ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - διανομή\n"
 
-#: ../urpm/search.pm:68
 #: ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - .\n"
 
-#: ../urpm/search.pm:69
 #: ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename      - όνομα αρχείου του πακέτου\n"
 
-#: ../urpm/search.pm:70
 #: ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files          - λίστα αρχείων που περιέχονται στο πακέτο.\n"
 
-#: ../urpm/search.pm:71
 #: ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - ομάδα\n"
 
-#: ../urpm/search.pm:72
 #: ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - άδεια\n"
 
-#: ../urpm/search.pm:73
 #: ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - όνομα πακέτου\n"
 
-#: ../urpm/search.pm:74
 #: ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - αναζήτηση στο πεδίο «obsoletes»\n"
 
-#: ../urpm/search.pm:75
 #: ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - δημιουργός πακέτου\n"
 
-#: ../urpm/search.pm:76
 #: ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - τύπωσε την ετικέτα με τις παροχές: όλες οι παροχές.\n"
+msgstr ""
+"  --provides     - τύπωσε την ετικέτα με τις παροχές: όλες οι παροχές.\n"
 
-#: ../urpm/search.pm:77
 #: ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - τύπωσε την ετικέτα με τις εξαρτήσεις: όλες οι εξαρτήσεις.\n"
+msgstr ""
+"  --requires     - τύπωσε την ετικέτα με τις εξαρτήσεις: όλες οι "
+"εξαρτήσεις.\n"
 
-#: ../urpm/search.pm:78
 #: ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - μέγεθος εγκατεστημένου\n"
 
-#: ../urpm/search.pm:79
 #: ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - όνομα πηγαίου rpm\n"
 
-#: ../urpm/search.pm:80
 #: ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - αναζήτηση στο πεδίο «suggests»\n"
 
-#: ../urpm/search.pm:81
 #: ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       -  περίληψη.\n"
 
-#: ../urpm/search.pm:82
 #: ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpm/search.pm:83
 #: ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - κατασκευαστής\n"
 
-#: ../urpm/search.pm:84
 #: ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - το μέσο στο οποίο βρέθηκε το πακέτο\n"
 
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:99
+#: ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - τύπωσε την έκδοση, κυκλοφορίας και αρχιτεκτονικής με όνομα.\n"
+msgstr ""
+"  -f             - τύπωσε την έκδοση, κυκλοφορίας και αρχιτεκτονικής με "
+"όνομα.\n"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "μη τερματισμένη έκφραση (%s)"
 
-#: ../urpm/search.pm:197
 #: ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Άγνωστος τύπος: μπορείτε να χρησιμοποιήσετε μόνο μια επιλογή πολλαπλών τιμών (multi-valued tag)"
+msgstr ""
+"Άγνωστος τύπος: μπορείτε να χρησιμοποιήσετε μόνο μια επιλογή πολλαπλών τιμών "
+"(multi-valued tag)"
 
-#: ../urpm/search.pm:290
 #: ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
 
-#: ../urpm/search.pm:297
 #: ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "δεν υπάρχει διαθέσιμη σύνθεση για το μέσο \"%s\""
 
-#: ../urpm/search.pm:304
 #: ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "δεν υπάρχουν διαθέσιμες πληροφορίες xml για το μέσο \"%s\""
 
-#: ../urpm/select.pm:30
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας δεν έχει αλλάξει"
-
-#: ../urpm/select.pm:32
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας έχει αλλάξει: %s vs %s"
-
-#: ../urpm/select.pm:170
-#, c-format
-msgid "No package named %s"
-msgstr "Κανένα πακέτο με το όνομα %s"
-
-#: ../urpm/select.pm:172
-#: ../urpme:115
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Τα παρακάτω πακέτα περιέχουν %s: %s"
-
-#: ../urpm/select.pm:174
-#, c-format
-msgid "You should use \"-a\" to use all of them"
-msgstr "Θα πρέπει να χρησιμοποιήσεις \"-a\" για την επιλογή όλων"
-
-#: ../urpm/select.pm:295
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "τα πακέτα %s βρέθηκαν στην βάση δεδομένων του urpmi, αλλά κανένα τους δεν είναι εγκατεστημένο"
-
-#: ../urpm/select.pm:538
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Το πακέτο %s είναι ήδη εγκατεστημένο"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Τα πακέτα %s είναι ήδη εγκατεστημένα"
-
-#: ../urpm/select.pm:557
-#: ../urpm/select.pm:641
-#, c-format
-msgid "due to missing %s"
-msgstr "λόγω έλλειψης του %s"
-
-#: ../urpm/select.pm:558
-#, c-format
-msgid "due to already installed %s"
-msgstr "επειδή το %s είναι ήδη εγκατεστημένο"
-
-#: ../urpm/select.pm:559
-#: ../urpm/select.pm:639
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "λόγω μη ικανοποίησης του %s"
-
-#: ../urpm/select.pm:565
-#, c-format
-msgid "trying to promote %s"
-msgstr "προσπάθεια ενίσχυσης του %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "in order to keep %s"
-msgstr "για να κρατηθεί το %s"
-
-#: ../urpm/select.pm:607
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Το παρακάτω πακέτο πρέπει να αφαιρεθεί για να αναβαθμιστούν κάποια άλλα:\n"
-"%s"
-
-#: ../urpm/select.pm:608
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
-"%s"
-
-#: ../urpm/select.pm:635
-#, c-format
-msgid "in order to install %s"
-msgstr "για να εγκατασταθεί το %s"
-
-#: ../urpm/select.pm:645
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "λόγω συγκρούσεων με το %s"
-
-#: ../urpm/signature.pm:32
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Μη έγκυρη υπογραφή (%s)"
-
-#: ../urpm/signature.pm:63
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Μη έγκυρο ID Κλειδιού (%s)"
-
-#: ../urpm/signature.pm:65
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Απουσία υπογραφής (%s)"
-
-#: ../urpm/sys.pm:178
-#, c-format
-msgid "system"
-msgstr "σύστημα"
-
-#: ../urpm/sys.pm:213
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Θα πρέπει να κάνεις επανεκκίνηση στο %s για το %s"
-
-#: ../urpm/sys.pm:316
-#, c-format
-msgid "Can't write file"
-msgstr "Αδυναμία εγγραφής του αρχείου"
-
-#: ../urpm/sys.pm:316
-#, c-format
-msgid "Can't open file"
-msgstr "Αδυναμία ανοίγματος του αρχείου"
-
-#: ../urpm/sys.pm:329
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Αδυναμία μετακίνησης του αρχείου %s στο %s"
-
-#: ../urpme:41
-#, 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"
-msgstr ""
-"urpme έκδοση %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της GNU GPL.\n"
-"\n"
-"χρήση:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - αυτόματη επιλογή πακέτου κατ' επιλογήν.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - απομάκρυνση των ορφανών\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - επαλήθευση ότι η αφαίρεση μπορεί να επιτευχθεί σωστά.\n"
-
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - διανεμημένα urpmi κατά μήκος των μηχανών με ψευδώνυμα.\n"
-
-#: ../urpme:52
-#: ../urpmi:142
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Ξανά-πακετάρισμα των αρχείων πριν την διαγραφή\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - χρήση διαφορετικής διαδρομής root για την αφαίρεση rpm.\n"
-
-#: ../urpme:55
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - ενημέρωση της βάσης rpm αλλά όχι το σύστημα αρχείων.\n"
-
-#: ../urpme:56
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - να μην εκτελεστούν τα scripts απεγκατάστασης.\n"
-
-#: ../urpme:57
-#, 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"
-msgstr ""
-"  --use-distrib  - ρύθμιση urpme απευθείας από ένα δέντρο διανομής, χρήσιμο\n"
-"                   για την (απ)εγκατάσταση ενός chroot με την --root επιλογή.\n"
-
-#: ../urpme:59
-#: ../urpmi:153
-#: ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - αναλυτική λειτουργία.\n"
-
-#: ../urpme:60
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - επιλογή όλων των πακέτων που ταιριάζουν με την έκφραση.\n"
-
-#: ../urpme:73
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφαιρέσει πακέτα"
-
-#: ../urpme:106
-#, c-format
-msgid "unknown packages"
-msgstr "άγνωστα πακέτα"
-
-#: ../urpme:106
-#, c-format
-msgid "unknown package"
-msgstr "άγνωστο πακέτο"
-
-#: ../urpme:121
-#, 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] "Η αφαίρεση των παρακάτω πακέτων θα καταστρέψει το σύστημά σου:"
-
-#: ../urpme:126
-#, c-format
-msgid "Nothing to remove"
-msgstr "Τίποτα προς αφαίρεση"
-
-#: ../urpme:143
-#, c-format
-msgid "No orphans to remove"
-msgstr "Δεν υπάρχουν ορφανά προς αφαίρεση"
-
-#: ../urpme:149
-#, 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] "Για να ικανοποιηθούν οι εξαρτήσεις, θα αφαιρεθούν τα παρακάτω %d πακέτα"
-
-#: ../urpme:154
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "(ορφανό πακέτο)"
-msgstr[1] "(ορφανά πακέτα)"
-
-#: ../urpme:161
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Αφαίρεση %d πακέτου;"
-msgstr[1] "Αφαίρεση %d πακέτων;"
-
-#: ../urpme:161
-#: ../urpmi:554
-#: ../urpmi:649
-#: ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
-#, c-format
-msgid "testing removal of %s"
-msgstr "δοκιμαστική αφαίρεση του %s"
-
-#: ../urpme:181
-#, c-format
-msgid "Removal failed"
-msgstr "Η αφαίρεση απέτυχε"
-
-#: ../urpme:183
-#, c-format
-msgid "Removal is possible"
-msgstr "Η αφαίρεση είναι δυνατή"
-
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "μη τερματισμένη έκφραση (%s)"
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2086,24 +2052,27 @@ msgstr "    --force-key    - εξαναγκασμός ενημέρωσης το�
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - απομάκρυνση των ορφανών, χωρίς επιβαιβέωση\n"
 
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
-msgstr "  --no-suggests  - να μην επιλεγούν αυτόματα τα \"προτεινόμενα\" πακέτα.\n"
+msgstr ""
+"  --no-suggests  - να μην επιλεγούν αυτόματα τα \"προτεινόμενα\" πακέτα.\n"
 
 #: ../urpmi:86
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr "  --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε την εγκατάσταση.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε "
+"την εγκατάσταση.\n"
 
 #: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - μη εγκατάσταση πακέτων (μόνο λήψη)\n"
 
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2119,14 +2088,16 @@ msgid ""
 "                   are going to be installed or upgraded,\n"
 "                   default is %d.\n"
 msgstr ""
-"  --split-level  - διαχωρισμός σε μικρότερες συναλλαγές, αν περισσότερα από τα καθορισμένα\n"
+"  --split-level  - διαχωρισμός σε μικρότερες συναλλαγές, αν περισσότερα από "
+"τα καθορισμένα\n"
 "                   πακέτα πρόκειται να ενημερωθούν ή να αναβαθμιστούν.\n"
 "                   Η προεπιλογή είναι %d.\n"
 
 #: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - μικρότερο μήκος συναλλαγής, η προεπιλογή είναι %d.\n"
+msgstr ""
+"  --split-length - μικρότερο μήκος συναλλαγής, η προεπιλογή είναι %d.\n"
 
 #: ../urpmi:96
 #, c-format
@@ -2141,12 +2112,15 @@ msgstr "  --buildrequires - εγκατάσταση των buildrequires των �
 #: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
+msgstr ""
+"  --install-src  - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
 
 #: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - αφαίρεσε τα rpm από την προσωρινή μνήμη πριν από κάθε άλλο.\n"
+msgstr ""
+"  --clean        - αφαίρεσε τα rpm από την προσωρινή μνήμη πριν από κάθε "
+"άλλο.\n"
 
 #: ../urpmi:100
 #, c-format
@@ -2155,8 +2129,11 @@ msgstr "  --noclean      - κρατά τα rpm στην προσωρινή μν�
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - εξαναγκασμός εγκατάστασης πακέτων που είναι ήδη εγκατεστημένα.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - εξαναγκασμός εγκατάστασης πακέτων που είναι ήδη "
+"εγκατεστημένα.\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2164,7 +2141,8 @@ msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
-"  --allow-nodeps - επέτρεψε στον χρήστη να ρωτάει για να εγκατεστημένα πακέτα χωρίς\n"
+"  --allow-nodeps - επέτρεψε στον χρήστη να ρωτάει για να εγκατεστημένα "
+"πακέτα χωρίς\n"
 "                   να ελέγχει τις εξαρτήσεις.\n"
 
 #: ../urpmi:106
@@ -2187,12 +2165,11 @@ msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
-"  --use-distrib  - ρύθμισε το urpmi απευθείας από ένα δένδρο διανομής, χρήσιμο\n"
+"  --use-distrib  - ρύθμισε το urpmi απευθείας από ένα δένδρο διανομής, "
+"χρήσιμο\n"
 "                   για να εγκαταστήσετε ένα  chroot με την επιλογή --root .\n"
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr "  --metalink     - δημιουργία και χρήση ενός τοπικού μετασυνδέσμου.\n"
@@ -2224,16 +2201,15 @@ msgstr "  --wget-options - πρόσθετες επιλογές για να πε�
 #: ../urpmi:121
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
-msgstr "  --prozilla-options - πρόσθετες επιλογές για να περάσετε στο prozilla\n"
+msgstr ""
+"  --prozilla-options - πρόσθετες επιλογές για να περάσετε στο prozilla\n"
 
 #: ../urpmi:122
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - πρόσθετες επιλογές για να περάσετε στο aria2\n"
 
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - περιόρισε την ταχύτητα λήψης.\n"
@@ -2245,31 +2221,29 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 "  --resume       - ανάκτηση της λήψης ελλιπών αρχείων\n"
-"                   (--no-resume το απενεργοποιεί, από προεπιλογή είναι απενεργοποιημένο).\n"
+"                   (--no-resume το απενεργοποιεί, από προεπιλογή είναι "
+"απενεργοποιημένο).\n"
 
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 "  --proxy        - χρήση καθορισμένου HTTP proxy, ο αριθμός της θύρας\n"
-"                   θεωρείται ότι είναι από προεπιλογή ο 1080  (η μορφή είναι <proxyhost[:port]>).\n"
+"                   θεωρείται ότι είναι από προεπιλογή ο 1080  (η μορφή είναι "
+"<proxyhost[:port]>).\n"
 
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --proxy-user   - καθορίζει τον χρήστη και τον κωδικό πρόσβασης που θα χρησιμοποιηθεί για\n"
-"                   τον έλεγχο ταυτότητας στον proxy (η μορφή είναι <user:password>).\n"
+"  --proxy-user   - καθορίζει τον χρήστη και τον κωδικό πρόσβασης που θα "
+"χρησιμοποιηθεί για\n"
+"                   τον έλεγχο ταυτότητας στον proxy (η μορφή είναι <user:"
+"password>).\n"
 
 #: ../urpmi:130
 #, c-format
@@ -2293,12 +2267,16 @@ msgstr "  --excludedocs  - εξαιρούμενα αρχεία τεκμηρίω�
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - να μην γίνει έλεγχος της χωρητικότητας του δίσκου πριν την εγκατάσταση.\n"
+msgstr ""
+"  --ignoresize   - να μην γίνει έλεγχος της χωρητικότητας του δίσκου πριν "
+"την εγκατάσταση.\n"
 
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - επιτρέπει την εγκατάσταση πακέτων για άλλες αρχιτεκτονικές.\n"
+msgstr ""
+"  --ignorearch   - επιτρέπει την εγκατάσταση πακέτων για άλλες "
+"αρχιτεκτονικές.\n"
 
 #: ../urpmi:140
 #, c-format
@@ -2326,7 +2304,8 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --more-choices - όταν βρίσκονται πολλά πακέτα, να προτείνονται περισσότερες επιλογές \n"
+"  --more-choices - όταν βρίσκονται πολλά πακέτα, να προτείνονται "
+"περισσότερες επιλογές \n"
 "                   από αυτές της προεπιλογής.\n"
 
 #: ../urpmi:147
@@ -2337,13 +2316,15 @@ msgstr "  --nolock       - μα μην κλειδωθεί η βάση rpm.\n"
 #: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - αναβάθμισε μόνο τα πακέτα με την ίδια αρχιτεκτονική.\n"
+msgstr ""
+"  --strict-arch  - αναβάθμισε μόνο τα πακέτα με την ίδια αρχιτεκτονική.\n"
 
-#: ../urpmi:149
-#: ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - επιλογή όλων των μέσων που ταιριάζουν στην γραμμή εντολών.\n"
+msgstr ""
+"  -a             - επιλογή όλων των μέσων που ταιριάζουν στην γραμμή "
+"εντολών.\n"
 
 #: ../urpmi:152
 #, c-format
@@ -2358,12 +2339,15 @@ msgstr "  --debug        - περισσότερο αναλυτική λειτο�
 #: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  τα ονόματα ή τα αρχεία rpm που δόθηκαν στην γραμμή εντολών θα εγκατασταθούν.\n"
+msgstr ""
+"  τα ονόματα ή τα αρχεία rpm που δόθηκαν στην γραμμή εντολών θα "
+"εγκατασταθούν.\n"
 
 #: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Σφάλμα: αδύνατη η χρήση του --auto-select παράλληλα με τη λίστα πακέτων.\n"
+msgstr ""
+"Σφάλμα: αδύνατη η χρήση του --auto-select παράλληλα με τη λίστα πακέτων.\n"
 
 #: ../urpmi:190
 #, c-format
@@ -2371,13 +2355,16 @@ msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
-"Σφάλμα: Για την δημιουργία αναφοράς bug, καθορίστε τους ορισμούς της γραμμής εντολών\n"
+"Σφάλμα: Για την δημιουργία αναφοράς bug, καθορίστε τους ορισμούς της γραμμής "
+"εντολών\n"
 "με το --bug.\n"
 
 #: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
-msgstr "Δεν μπορείτε να εγκαταστήσετε δυαδικά αρχεία rpm  όταν χρησιμοποιείτε --install-src"
+msgstr ""
+"Δεν μπορείτε να εγκαταστήσετε δυαδικά αρχεία rpm  όταν χρησιμοποιείτε --"
+"install-src"
 
 #: ../urpmi:221
 #, c-format
@@ -2391,13 +2378,20 @@ msgstr "αντιστοίχηση στο --buildrequires"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "παρακαλώ χρησιμοποιήστε --buildrequires ή --install-src, από προεπιλογή --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"παρακαλώ χρησιμοποιήστε --buildrequires ή --install-src, από προεπιλογή --"
+"buildrequires"
 
 #: ../urpmi:253
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Ο κατάλογος [%s] υπάρχει ήδη, παρακαλώ χρησιμοποιήστε ένα διαφορετικό κατάλογο για να αναφορά σφάλματος ή διαγράψτε το"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Ο κατάλογος [%s] υπάρχει ήδη, παρακαλώ χρησιμοποιήστε ένα διαφορετικό "
+"κατάλογο για να αναφορά σφάλματος ή διαγράψτε το"
 
 #: ../urpmi:254
 #, c-format
@@ -2413,46 +2407,45 @@ msgstr ""
 "Σφάλμα: το %s φαίνεται να είναι προσαρτημένο μόνο για ανάγνωση.\n"
 "Χρησιμοποίησε το --allow-force για να εξαναγκάσεις τη λειτουργία."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Ενημέρωση των μέσων...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (προς αναβάθμιση)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (προς αναβάθμιση)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (προς εγκατάσταση)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (προς εγκατάσταση)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "Για να ικανοποιηθούν οι εξαρτήσεις του '%s', απαιτείται ένα από τα παρακάτω πακέτα:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις του '%s', απαιτείται ένα από τα παρακάτω "
+"πακέτα:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ποια είναι η επιλογή σας; (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2463,19 +2456,19 @@ msgstr ""
 "που είναι παλαιότερα από αυτά που είναι εγκατεστημένα:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
 msgstr ""
-"Τα ακόλουθα πακέτα δεν μπορούν να εγκατασταθούν, γιατί εξαρτώνται από πακέτα\n"
+"Τα ακόλουθα πακέτα δεν μπορούν να εγκατασταθούν, γιατί εξαρτώνται από "
+"πακέτα\n"
 "που είναι παλαιότερα από αυτά που είναι εγκατεστημένα:\n"
 "%s"
 
-#: ../urpmi:503
-#: ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2484,15 +2477,12 @@ msgstr ""
 "\n"
 "Να συνεχίσω την εγκατάσταση;"
 
-#: ../urpmi:504
-#: ../urpmi:519
-#: ../urpmi:613
-#: ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2501,7 +2491,7 @@ msgstr ""
 "Ένα από τα πακέτα που ζητήθηκε δεν μπορεί να εγκατασταθεί:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2510,12 +2500,12 @@ msgstr ""
 "Ορισμένα πακέτα που ζητήθηκαν δεν μπορούν να εγκατασταθούν:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "η αφαίρεση του πακέτου %s θα καταστρέψει το σύστημά σου"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2526,70 +2516,73 @@ msgstr ""
 "πρέπει να αφαιρεθεί, για να αναβαθμιστούν κάποια άλλα:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
 msgstr ""
-"Η εγκατάσταση δεν μπορεί να συνεχιστεί διότι τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
+"Η εγκατάσταση δεν μπορεί να συνεχιστεί διότι τα παρακάτω πακέτα πρέπει να "
+"αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(μονάχα έλεγχος, η αφαίρεση δεν θα γίνει πραγματικά)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
-"Πρέπει πρώτα να χρησιμοποιήσετε την urpmi --buildrequires για να εγκαταστήσετε τις παρακάτω εξαρτήσεις:\n"
+"Πρέπει πρώτα να χρησιμοποιήσετε την urpmi --buildrequires για να "
+"εγκαταστήσετε τις παρακάτω εξαρτήσεις:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Θα αφαιρεθεί το παρακάτω ορφανό πακέτο."
 msgstr[1] "Θα αφαιρεθούν τα παρακάτω ορφανά πακέτα."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(μονάχα έλεγχος, η εγκατάσταση δεν θα γίνει πραγματικά)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Θα χρησιμοποιηθεί επιπλέον χώρος %s στο σκληρό δίσκο."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Θα ελευθερωθεί %s χώρου στο σκληρό δίσκο."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s των πακέτων θα ανακτηθούν."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Συνέχιση με την εγκατάσταση ενός πακέτου;"
 msgstr[1] "Συνέχιση με την εγκατάσταση των %d πακέτων;"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Πατήστε Enter όταν προσαρτηθεί..."
@@ -2627,7 +2620,8 @@ msgstr ""
 "       cdrom://<διαδρομή>\n"
 "\n"
 "χρήση: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
-"χρήση: urpmi.addmedia [options] --mirrorlist <url> <όνομα> <σχετική διαδρομή>\n"
+"χρήση: urpmi.addmedia [options] --mirrorlist <url> <όνομα> <σχετική "
+"διαδρομή>\n"
 "\n"
 "παραδείγματα:\n"
 "\n"
@@ -2637,32 +2631,31 @@ msgstr ""
 "\n"
 "και οι [επιλογές] είναι από\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+"  --wget         - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+"  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
-msgstr "  --prozilla     - χρήση του prozilla για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+"  --prozilla     - χρήση του prozilla για την ανάκτηση απομακρυσμένων "
+"αρχείων.\n"
 
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
-msgstr "  --aria2         - χρήση του aria2, για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+"  --aria2         - χρήση του aria2, για την ανάκτηση απομακρυσμένων "
+"αρχείων.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
@@ -2671,16 +2664,19 @@ msgid ""
 "                   or discard non-update media (when used with --distrib)\n"
 msgstr ""
 "  --update       - δημιουργία μέσου «ενημερώσεων» , \n"
-"                   ή εξαναγκασμός χρήσης των μέσων «ενημερώσεων» (αν γίνει χρήση με --distrib)\n"
+"                   ή εξαναγκασμός χρήσης των μέσων «ενημερώσεων» (αν γίνει "
+"χρήση με --distrib)\n"
 
 #: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
 "  --xml-info     - λήψη των αρχείων xml info με την καθορισμένη πολιτική\n"
-"                   απο τις εξής: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   απο τις εξής: never, on-demand, update-only, always. cf "
+"urpmi.cfg(5)\n"
 
 #: ../urpmi.addmedia:69
 #, c-format
@@ -2709,7 +2705,8 @@ msgstr ""
 #: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  - με --distrib, ρωτά επιβεβαίωση για κάθε μέσο (media)\n"
+msgstr ""
+"  --interactive  - με --distrib, ρωτά επιβεβαίωση για κάθε μέσο (media)\n"
 
 #: ../urpmi.addmedia:76
 #, c-format
@@ -2722,16 +2719,18 @@ msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
-"  --from         - χρήση του καθορισμένου url για την λίστα των mirrors, η προεπιλογή είναι\n"
+"  --from         - χρήση του καθορισμένου url για την λίστα των mirrors, η "
+"προεπιλογή είναι\n"
 "                   %s\n"
 
 #: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
-msgstr "  --virtual      - δημιουργία εικονικών μέσων (media) τα οποία είναι πάντα ενημερωμένα.\n"
+msgstr ""
+"  --virtual      - δημιουργία εικονικών μέσων (media) τα οποία είναι πάντα "
+"ενημερωμένα.\n"
 
-#: ../urpmi.addmedia:80
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - απενεργοποίηση του MD5SUM ελέγχου του αρχείου .\n"
@@ -2739,23 +2738,23 @@ msgstr "  --no-md5sum    - απενεργοποίηση του MD5SUM ελέγχ
 #: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
-msgstr "  --nopubkey     - να μην γίνει εισαγωγή δημόσιου κλειδιού των νέων μέσων (media)\n"
+msgstr ""
+"  --nopubkey     - να μην γίνει εισαγωγή δημόσιου κλειδιού των νέων μέσων "
+"(media)\n"
 
 #: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - προσθήκη του μέσου (media) στην διαμόρφωση, αλλά χωρίς ενημέρωση.\n"
+msgstr ""
+"  --raw          - προσθήκη του μέσου (media) στην διαμόρφωση, αλλά χωρίς "
+"ενημέρωση.\n"
 
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - σιωπηλή λειτουργία.\n"
 
-#: ../urpmi.addmedia:84
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - αναλυτική περιγραφή.\n"
@@ -2773,7 +2772,9 @@ msgstr "δεν απαιτείται όρισμα για --distrib --mirrorlist <
 #: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "εσφαλμένο <url> (στην περίπτωση τοπικού καταλόγου, η διαδρομή θα πρέπει να είναι απόλυτη)"
+msgstr ""
+"εσφαλμένο <url> (στην περίπτωση τοπικού καταλόγου, η διαδρομή θα πρέπει να "
+"είναι απόλυτη)"
 
 #: ../urpmi.addmedia:124
 #, c-format
@@ -2793,7 +2794,8 @@ msgstr "Δεν μπορεί να δημιουργηθεί το αρχείο ρυ
 #: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "δε χρειάζεται να δώσεις <σχετική διαδρομή του synthesis>  με το --distrib"
+msgstr ""
+"δε χρειάζεται να δώσεις <σχετική διαδρομή του synthesis>  με το --distrib"
 
 #: ../urpmi.addmedia:144
 #, c-format
@@ -2824,13 +2826,15 @@ msgstr "Αδυναμία προσθήκης μέσου"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "Έκδοση urpmi.recover %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
 "\n"
 "χρήση:\n"
 
@@ -2843,18 +2847,24 @@ msgstr "  --checkpoint   - ορίστε τώρα το σημείο αναφορ�
 #, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
-"  --noclean      - να μην γίνει καθαρισμός του φακέλου αναδημιουργίας πακέτων\n"
+"  --noclean      - να μην γίνει καθαρισμός του φακέλου αναδημιουργίας "
+"πακέτων\n"
 "κατά την αρχικοποίηση του σημείου αναφοράς\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
-msgstr "  --list         - λίστα συναλλαγών που έγιναν από μια καθορισμένη ημερομηνία/διάρκεια και μετά\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
+msgstr ""
+"  --list         - λίστα συναλλαγών που έγιναν από μια καθορισμένη "
+"ημερομηνία/διάρκεια και μετά\n"
 
 #: ../urpmi.recover:38
 #, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - εμφανίζει την λίστα με όλες τις συναλλαγές της βάσης RPM.\n"
+msgstr ""
+"  --list-all     - εμφανίζει την λίστα με όλες τις συναλλαγές της βάσης "
+"RPM.\n"
 
 #: ../urpmi.recover:39
 #, c-format
@@ -2869,7 +2879,8 @@ msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
-"  --rollback     - επαναφορά στην κατάσταση που αντιστοιχεί στην καθορισμένη ημερομηνία,\n"
+"  --rollback     - επαναφορά στην κατάσταση που αντιστοιχεί στην καθορισμένη "
+"ημερομηνία,\n"
 "                   ή υποχώρηση σύμφωνα με τον καθορισμένο αριθμό συναλλαγών\n"
 
 #: ../urpmi.recover:42
@@ -2912,12 +2923,14 @@ msgstr "Λανθασμένα ορίσματα της γραμμής εντολώ
 #: ../urpmi.recover:84
 #, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --rollback \n"
+msgstr ""
+"Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --rollback \n"
 
 #: ../urpmi.recover:86
 #, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --list \n"
+msgstr ""
+"Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --list \n"
 
 #: ../urpmi.recover:88
 #, c-format
@@ -2939,8 +2952,7 @@ msgstr "Δεν βρέθηκε συναλλαγή από %s\n"
 msgid "You must be superuser to do this"
 msgstr "Πρέπει να είστε υπερχρήστης για να  το πράξετε αυτό"
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Εγγραφή αρχείου rpm μακροεντολών [%s]...\n"
@@ -2987,7 +2999,9 @@ msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφα�
 #: ../urpmi.removemedia:72
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "τίποτα για διαγραφή (χρησιμοποιήστε το urpmi.addmedia για να προσθέσετε ένα μέσο)\n"
+msgstr ""
+"τίποτα για διαγραφή (χρησιμοποιήστε το urpmi.addmedia για να προσθέσετε ένα "
+"μέσο)\n"
 
 #: ../urpmi.removemedia:78
 #, c-format
@@ -3020,12 +3034,15 @@ msgstr "  --force-key    - εξαναγκασμός ενημέρωσης του
 #: ../urpmi.update:46
 #, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
-msgstr "  --ignore       - να μην ενημερωθεί, να σημειωθεί το μέσο ως αγνοημένο.\n"
+msgstr ""
+"  --ignore       - να μην ενημερωθεί, να σημειωθεί το μέσο ως αγνοημένο.\n"
 
 #: ../urpmi.update:47
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr "  --no-ignore    - να μην γίνει ενημέρωση, το μέσο θα σημειωθεί ως ενεργοποιημένο.\n"
+msgstr ""
+"  --no-ignore    - να μην γίνει ενημέρωση, το μέσο θα σημειωθεί ως "
+"ενεργοποιημένο.\n"
 
 #: ../urpmi.update:49
 #, c-format
@@ -3045,19 +3062,23 @@ msgstr "  -f             - εξαναγκάζει την ενημέρωση τω
 #: ../urpmi.update:52
 #, c-format
 msgid "  -ff            - really force updating synthesis\n"
-msgstr "  -ff            - εξαναγκάζει πραγματικά την ενημέρωση των αρχείων synthesis\n"
+msgstr ""
+"  -ff            - εξαναγκάζει πραγματικά την ενημέρωση των αρχείων "
+"synthesis\n"
 
 #: ../urpmi.update:69
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να αναβαθμίζει τα μέσα"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για να προσθέσετε ένα μέσο)\n"
+msgstr ""
+"τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για να προσθέσετε ένα "
+"μέσο)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3066,17 +3087,17 @@ msgstr ""
 "η επιλογή για αναβάθμιση λείπει\n"
 "(ένα εκ των %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "παράβλεψη του μέσου %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "ενεργοποίηση του μέσου %s"
@@ -3086,19 +3107,23 @@ msgstr "ενεργοποίηση του μέσου %s"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "Έκδοση urpmq %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
 "\n"
 "χρήση:\n"
 
 #: ../urpmq:48
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr ""
 "  --searchmedia  - χρήση μόνο των μέσων που δόθηκαν, στην αναζήτηση των\n"
 "                   ζητούμενων (ή των αναβαθμιζόμενων) πακέτων.\n"
@@ -3126,7 +3151,8 @@ msgstr "  --list-media   - εμφανίζει τα διαθέσιμα μέσα �
 #: ../urpmq:60
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url     - εμφανίζει τα διαθέσιμα μέσα ενημέρωσης και τα URL τους.\n"
+msgstr ""
+"  --list-url     - εμφανίζει τα διαθέσιμα μέσα ενημέρωσης και τα URL τους.\n"
 
 #: ../urpmq:61
 #, c-format
@@ -3142,7 +3168,8 @@ msgstr "  --list-aliases - λίστα των διαθέσιμων παράλλη
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - εμφανίζει την διαμόρφωση με τη μορφή ενός ορίσματος\n"
 "                   urpmi.addmedia.\n"
@@ -3156,8 +3183,10 @@ msgstr ""
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - δίνει όλα τα πηγαία πακέτα πριν τη λήψη (μόνο root).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - δίνει όλα τα πηγαία πακέτα πριν τη λήψη (μόνο root).\n"
 
 #: ../urpmq:67
 #, c-format
@@ -3285,13 +3314,18 @@ msgstr "  -r             - αναλυτική εμφάνιση της έκδοσ
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --src).\n"
+msgstr ""
+"  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
+"src).\n"
 
 #: ../urpmq:106
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  -u             - αφαίρεση του πακέτου εάν μια πιο πρόσφατη έκδοση είναι ήδη\n"
+"  -u             - αφαίρεση του πακέτου εάν μια πιο πρόσφατη έκδοση είναι "
+"ήδη\n"
 "                   εγκατεστημένη.\n"
 
 #: ../urpmq:107
@@ -3303,14 +3337,16 @@ msgstr "  -y             - επιβάλει την ασαφής αναζήτησ
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
-"  -Y             - όπως το -y, αλλά δεν λαμβάνει υπόψη τον τύπο των χαρακτήρων\n"
+"  -Y             - όπως το -y, αλλά δεν λαμβάνει υπόψη τον τύπο των "
+"χαρακτήρων\n"
 "                   (κεφαλαία/πεζά).\n"
 
 # ???
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  τα ονόματα ή τα αρχεία rpm που δόθηκαν στη γραμμή εντολών συγκεντρώθηκαν.\n"
+msgstr ""
+"  τα ονόματα ή τα αρχεία rpm που δόθηκαν στη γραμμή εντολών συγκεντρώθηκαν.\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3330,66 +3366,94 @@ msgstr "χρησιμοποίησε το -l για να δεις μια λίστ�
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα αποτελέσματα για το πακέτο %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα "
+"αποτελέσματα για το πακέτο %s"
 
 #: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα αποτελέσματα για τα πακέτα %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα "
+"αποτελέσματα για τα πακέτα %s"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η λήψη αποτελεσμάτων για το πακέτο %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η λήψη "
+"αποτελεσμάτων για το πακέτο %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η επιστροφή αποτελεσμάτων για τα πακέτα %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η επιστροφή "
+"αποτελεσμάτων για τα πακέτα %s"
 
 #: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Ενημέρωση των μέσων...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "εξέταση αρχείου %s"
+
 #~ msgid "invalid MD5SUM file"
 #~ msgstr "μη έγκυρο αρχείο MD5SUM"
+
 #~ msgid "found probed synthesis as %s"
 #~ msgstr "το αρχείο synthesis εντοπίστηκε σαν %s"
+
 #~ msgid "  --update       - create an update medium.\n"
 #~ msgstr "  --update       - δημιουργία μέσου αναβάθμισης.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "κακοδιατυπωμένο URL: [%s]"
+
 #~ msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 #~ msgstr ""
 #~ "δεν μπορείτε να χρησιμοποιήσετε --install-src για να εγκαταστήσετε "
 #~ "απομακρυσμένα .src.rpm αρχεία"
+
 #~ msgid "Error"
 #~ msgstr "Σφάλμα"
+
 #~ msgid "%d installation transaction failed"
 #~ msgid_plural "%d installation transactions failed"
 #~ msgstr[0] "αποτυχία %d διεργασίας εγκατάστασης"
 #~ msgstr[1] "αποτυχία %d διεργασιών εγκατάστασης"
+
 #~ msgid "Package %s can not be installed"
 #~ msgstr "Το πακέτο %s δεν μπορεί να εγκατασταθεί"
+
 #~ msgid "Packages %s can not be installed"
 #~ msgstr "Τα πακέτα %s δεν μπορούν να εγκατασταθούν"
+
 #~ msgid "Checking to remove the following packages"
 #~ msgstr "Έλεγχος για την αφαίρεση των παρακάτω πακέτων"
 
 #, fuzzy
 #~ msgid "%s database locked"
 #~ msgstr "Η βάση δεδομένων urpmi είναι κλειδωμένη"
+
 #~ msgid "Unknown option %s"
 #~ msgstr "Άγνωστη επιλογή %s"
+
 #~ msgid "too many mount points for removable medium \"%s\""
 #~ msgstr "πολλαπλά σημεία σύνδεσης για το αφαιρούμενο μέσο \"%s\""
+
 #~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 #~ msgstr "Το μέσο \"%s\" είναι ένα αρχείο ISO, θα προσαρτηθεί on-the-fly"
+
 #~ msgid "using different removable device [%s] for \"%s\""
 #~ msgstr "χρήση διαφορετικής αφαιρούμενης συσκευής  [%s] για το \"%s\""
+
 #~ msgid "unable to retrieve pathname for removable medium \"%s\""
 #~ msgstr ""
 #~ "αδυναμία ανάκτησης της διαδρομής (pathname) για το αφαιρούμενο μέσο \"%s\""
@@ -3397,6 +3461,7 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "unable to mount the distribution medium"
 #~ msgstr "αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης"
+
 #~ msgid ""
 #~ "unable to access medium \"%s\",\n"
 #~ "this could happen if you mounted manually the directory when creating the "
@@ -3405,6 +3470,7 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ "αδυναμία πρόσβασης μέσου \"%s\",\n"
 #~ "αυτό μπορεί να συμβαίνει εάν έχετε προσαρτήσει μόνοι σας τον κατάλογο "
 #~ "όταν δημιουργήθηκε το μέσο."
+
 #~ msgid "inconsistent medium \"%s\" marked removable but not really"
 #~ msgstr ""
 #~ "το αντιφατικό μέσο \"%s\" έχει αναφερθεί ως αφαιρούμενο αλλά δεν είναι "
@@ -3413,14 +3479,17 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "  -c             - clean headers cache directory.\n"
 #~ msgstr "  -v             - αναλυτική λειτουργία.\n"
+
 #~ msgid "virtual medium needs to be local"
 #~ msgstr "το εικονικό μέσο χρειάζεται να είναι τοπικό"
 
 #, fuzzy
 #~ msgid "unable to parse synthesis file of \"%s\""
 #~ msgstr "αδυναμία ανάλυσης του hdlist αρχείου από το \"%s\""
+
 #~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
 #~ msgstr "υπολογισμός md5sum από υπάρχουσα πηγή hdlist (ή synthesis) [%s]"
+
 #~ msgid ""
 #~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 #~ "ignored"
@@ -3431,6 +3500,7 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "invalid hdlist name"
 #~ msgstr "μη έγκυρο όνομα αρχείου rpm [%s]"
+
 #~ msgid "unable to find list file for \"%s\", medium ignored"
 #~ msgstr "αδυναμία εύρεσης αρχείου λίστας για το \"%s\", το μέσο αγνοείται"
 
@@ -3445,10 +3515,12 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "unable to access list file of \"%s\""
 #~ msgstr "αδυναμία ανάλυσης του hdlist αρχείου από το \"%s\""
+
 #~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 #~ msgstr ""
 #~ "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη "
 #~ "hdlist, το μέσο αγνοείται"
+
 #~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
 #~ msgstr ""
 #~ "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, "
@@ -3460,29 +3532,39 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ msgstr ""
 #~ "Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί "
 #~ "hdlists, το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
+
 #~ msgid "performing second pass to compute dependencies\n"
 #~ msgstr "γίνεται δεύτερος έλεγχος για να υπολογιστούν οι εξαρτήσεις\n"
+
 #~ msgid "building hdlist [%s]"
 #~ msgstr "δημιουργία hdlist [%s]"
+
 #~ msgid ""
 #~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 #~ "corrupted."
 #~ msgstr ""
 #~ "αδυναμία δημιουργίας αρχείου σύνθεσης για το μέσο \"%s\". Το αρχείο "
 #~ "hdlist μπορεί να είναι λανθασμένο."
+
 #~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
 #~ msgstr ""
 #~ "πρόβλημα ανάγνωσης του hdlist ή του αρχείου σύνθεσης από το μέσο \"%s\""
+
 #~ msgid "computing md5sum of copied source hdlist (or synthesis)"
 #~ msgstr "υπολογισμός md5sum από αντιγραμμένης πηγής hdlist (ή synthesis)"
+
 #~ msgid "...retrieving failed: md5sum mismatch"
 #~ msgstr "... η ανάκτηση απέτυχε: Ασυμφωνία md5sum"
+
 #~ msgid "no rpm files found from [%s]"
 #~ msgstr "δεν βρέθηκαν αρχεία rpm από το [%s]"
+
 #~ msgid "unable to read rpm files from [%s]: %s"
 #~ msgstr "αδυναμία ανάγνωσης αρχείων rpm από το [%s]: %s"
+
 #~ msgid "no rpms read"
 #~ msgstr "καμία ανάγνωση rpm πακέτων"
+
 #~ msgid "reading headers from medium \"%s\""
 #~ msgstr "ανάγνωση επικεφαλίδων από το μέσο \"%s\""
 
@@ -3497,15 +3579,18 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ msgstr ""
 #~ "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 #~ "                    synthesis hdlist.\n"
+
 #~ msgid ""
 #~ "Note: since no media searched uses hdlists, urpmf was unable to return "
 #~ "any result\n"
 #~ msgstr ""
 #~ "Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί "
 #~ "hdlists, το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
+
 #~ msgid "You may want to use --name to search for package names.\n"
 #~ msgstr ""
 #~ "Μπορείτε να χρησιμοποιήσετε --name για την αναζήτηση ονομάτων πακέτων.\n"
+
 #~ msgid "  --src, -s      - next package is a source package.\n"
 #~ msgstr ""
 #~ "  --src, -s       - το επόμενο πακέτο είναι ένα πακέτο πηγαίου κώδικα \n"
@@ -3515,14 +3600,19 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ msgstr ""
 #~ "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 #~ "                    synthesis hdlist.\n"
+
 #~ msgid "unable to update medium \"%s\"\n"
 #~ msgstr "αδυναμία αναβάθμισης του μέσου \"%s\"\n"
+
 #~ msgid "unable to create medium \"%s\"\n"
 #~ msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
+
 #~ msgid "there are multiple packages with the same rpm filename \"%s\""
 #~ msgstr "υπάρχουν πολλαπλά πακέτα με το ίδιο όνομα αρχείου rpm \"%s\""
+
 #~ msgid "unable to correctly parse [%s] on value \"%s\""
 #~ msgstr "αδυναμία σωστής ανάλυσης του [%s] στην τιμή \"%s\""
+
 #~ msgid ""
 #~ "medium \"%s\" uses an invalid list file:\n"
 #~ "  mirror is probably not up-to-date, trying to use alternate method"
@@ -3530,14 +3620,19 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ "το μέσο \"%s\" χρησιμοποιεί ένα μη έγκυρο αρχείο λίστας:\n"
 #~ "  η τοποθεσία mirror μάλλον δεν είναι πλήρως ενημερωμένη, προσπάθεια "
 #~ "χρησιμοποίησης εναλλακτικής μεθόδου"
+
 #~ msgid "medium \"%s\" does not define any location for rpm files"
 #~ msgstr "το μέσο \"%s\" δεν καθορίζει κάποια τοποθεσία για τα αρχεία rpm"
+
 #~ msgid "unrequested"
 #~ msgstr "δεν ζητήθηκαν"
+
 #~ msgid " (%d MB)"
 #~ msgstr " (%d MB)"
+
 #~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 #~ msgstr "προσθήκη πακέτου %s (id=%d, eid=%d, αναβάθμιση=%d, αρχείο=%s)"
+
 #~ msgid ""
 #~ "The following packages have bad signatures:\n"
 #~ "%s\n"
@@ -3553,15 +3648,19 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "You need to be root to use --use-distrib"
 #~ msgstr "Πρέπει να είστε root για να κάνετε χρήση της εντολής ! \n"
+
 #~ msgid "unable to remove package %s"
 #~ msgstr "αδυναμία αφαίρεσης του πακέτου %s"
+
 #~ msgid "No filelist found\n"
 #~ msgstr "Δεν βρέθηκε αρχείο λίστας (filelist)\n"
+
 #~ msgid ""
 #~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 #~ msgstr ""
 #~ "Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα %d θα αφαιρεθούν (%"
 #~ "d MB)"
+
 #~ msgid ""
 #~ "To satisfy dependencies, the following %d packages are going to be "
 #~ "installed:\n"
@@ -3570,62 +3669,83 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ "Για να ικανοποιηθούν οι εξαρτήσεις, τα ακόλουθα πακέτα %d πρέπει να "
 #~ "εγκατασταθούν:\n"
 #~ "%s\n"
+
 #~ msgid "Installing packages on nodes..."
 #~ msgstr "Εγκατάσταση πακέτων στους κόμβους..."
+
 #~ msgid "Distributing files to %s..."
 #~ msgstr "Κατανομή αρχείων στο %s..."
+
 #~ msgid "Performing install on %s..."
 #~ msgstr "Εκτέλεση εγκατάστασης σε %s..."
+
 #~ msgid "Preparing install on %s..."
 #~ msgstr "Προετοιμάζω εγκατάσταση σε %s...."
+
 #~ msgid ""
 #~ "\n"
 #~ "unknown options '%s'\n"
 #~ msgstr ""
 #~ "\n"
 #~ "άγνωστες επιλογές '%s'\n"
+
 #~ msgid "unable to find hdlist file for \"%s\", medium ignored"
 #~ msgstr ""
 #~ "αδυναμία εύρεσης του αρχείου hdlist για το \"%s\", το μέσο αγνοείται"
+
 #~ msgid "inconsistent list file for \"%s\", medium ignored"
 #~ msgstr "μη συναφές αρχείο λίστας για το \"%s\", το μέσο αγνοείται"
+
 #~ msgid "unable to inspect list file for \"%s\", medium ignored"
 #~ msgstr ""
 #~ "αδυναμία επιθεώρησης αρχείου λίστας για το \"%s\", το μέσο αγνοείται"
+
 #~ msgid "virtual medium \"%s\" is not local, medium ignored"
 #~ msgstr "το εικονικό μέσο \"%s\" δεν είναι τοπικό, το μέσο αγνοείται"
+
 #~ msgid ""
 #~ "virtual medium \"%s\" should have valid source hdlist or synthesis, "
 #~ "medium ignored"
 #~ msgstr ""
 #~ "το εικονικό μέσο \"%s\" πρέπει να έχει έγκυρη πηγή hdlist ή σύνθεσης, το "
 #~ "μέσο αγνοείται"
+
 #~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
 #~ msgstr "αντιγραφή πηγής hdlist (ή synthesis) από \"%s\"..."
+
 #~ msgid "retrieval of source hdlist (or synthesis) failed"
 #~ msgstr "απέτυχε η ανάκτηση του πηγαίου hdlist (ή synthesis) "
+
 #~ msgid "file [%s] already used in the same medium \"%s\""
 #~ msgstr "το αρχείο [%s] χρησιμοποιείται από το ίδιο μέσο \"%s\""
+
 #~ msgid "nothing written in list file for \"%s\""
 #~ msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
+
 #~ msgid "found %d headers in cache"
 #~ msgstr "βρέθηκαν %d επικεφαλίδες στην προσωρινή μνήμη"
+
 #~ msgid "removing %d obsolete headers in cache"
 #~ msgstr ""
 #~ "αφαίρεση των μη χρησιμοποιημένων %d επικεφαλίδων από την προσωρινή μνήμη"
+
 #~ msgid "using process %d for executing transaction"
 #~ msgstr "χρήση διαδικασίας %d για την εκτέλεση transaction"
+
 #~ msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 #~ msgstr ""
 #~ "  --norebuild    - μην προσπαθείς να ξαναδημιουργήσεις την hdlist εάν δεν "
 #~ "είναι εγγράψιμη.\n"
+
 #~ msgid "copying hdlists file..."
 #~ msgstr "αντιγραφή αρχείου hdlist..."
+
 #~ msgid "invalid hdlist description \"%s\" in hdlists file"
 #~ msgstr "μη έγκυρη περιγραφή hdlist \"%s\" μέσα στο αρχείο hdlists"
+
 #~ msgid "   -g [group]     - restrict results to given group.\n"
 #~ msgstr ""
 #~ "   -g [group]     - περιορισμένα αποτελέσματα στην ομάδα που δόθηκε.\n"
+
 #~ msgid "                    defaults is %s.\n"
 #~ msgstr "                    προκαθορισμένο είναι το %s.\n"
-
diff --git a/po/eo.po b/po/eo.po
index b004525a..35d9f563 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-01-13 10:05+0100\n"
 "Last-Translator: Grégoire COLBERT <gcolbert2004@noos.fr>\n"
 "Language-Team: Esperanto <mandrak-eo@yahoogroups.com>\n"
@@ -23,22 +23,22 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM instalado"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Jes"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "Kion vi volas fari?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "Ĉu mi daŭrigu?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -89,22 +89,22 @@ msgstr ""
 "\n"
 "Eble vi preferas konservi ĝin kiel dosiero. Kion vi decidas?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instalu"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Konservu"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Nuligu"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Elektu dosieraron por konservi tiun dosieron"
@@ -210,12 +210,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Neniu pakaĵo indikita"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Bonvole atendu..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Devas esti sistemestro"
@@ -246,42 +246,42 @@ msgstr ""
 "%s\n"
 "Ĉu vi deziras tamen daŭrigi?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Averto"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Jes"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (ĝisdatigi)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (instali)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "Ĉ_esigu"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -292,14 +292,14 @@ msgstr ""
 "%s\n"
 "Ĉu vi deziras tamen daŭrigi?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -308,44 +308,51 @@ msgstr ""
 "esti instalataj:\n"
 "%s\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakaĵo, %d MB)"
 msgstr[1] "(%d pakaĵoj, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Ne povas preni fontajn pakaĵojn, mi ĉesiĝas."
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Mi preparas..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Bonvolu enmeti la portilon nomitan\"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Mi elŝutas pakaĵon '%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...ekstraktado malsukcesis: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Finata"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -356,28 +363,27 @@ msgstr ""
 "%s\n"
 "Eble vi ĝisdatigu vian urpmi-datenbazon"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalado malsukcesis:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "La pakaĵo(j) estas jam instalita(j)"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalo finita"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "foriganta %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartas urpmi"
@@ -451,58 +457,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "uzante specifan medion sur %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ne povis malfermi rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nevalida rpm-a dosiernomo [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "mi ekstraktas rpm-dosieron [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "... ekstraktado farita"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ekstraktado malsukcesis: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne povis atingi rpm-an dosieron [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ne povis analizi \"%s\" en dosiero [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ne povas registri rpm-dosieron"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "eraro dum registri lokajn pakaĵojn"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -542,22 +542,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -649,82 +649,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Kopiado malsukcesis"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "pro mankanta %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "pro mankanta %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "pro mankanta %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% of %s farita, ETA = %s, rapido = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% farita, rapido = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "foriganta %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...ekstraktado malsukcesis: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "nekonata protokolo difinita por %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "neniu ret-elŝutilo trovita, eblas uzi tiujn: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ne povas uzi la protokolon: %s"
@@ -744,59 +749,59 @@ msgstr "pakaĵo %s ne estis trovata."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ekstraktanta la rpm-dosierojn de datenportilo \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "transakcio kreita por instali sur %s (forigu=%d, instalu=%d, ĝisdatigu=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "ne povis krei transakcion"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ne povas forigi pakaĵon %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "ne povas instali pakaĵon %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "instalas %s el %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...ekstraktado malsukcesis: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "mi forigas la pakaĵon %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "mi forigas la pakaĵon %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "instalas %s el %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Kromaj informoj pri pakaĵo %s"
@@ -841,75 +846,80 @@ msgstr "Averto"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalado malsukcesis"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Instalado malsukcesis:"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "La sekvanta pakaĵo havas malĝustan signaturon"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "instalas %s el %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuanta %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalas %s el %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instalas %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalado eblas"
@@ -1114,7 +1124,7 @@ msgstr "kopiado de [%s] malsukcesis (dosiero estas strange malgranda)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "kalkulata md5sum de ekstraktita fonto hdlist (aŭ sintezo)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopiado de [%s] malsukcesis (md5sum-konfuzo)"
@@ -1154,32 +1164,32 @@ msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "ekstraktanta la font-hd-liston (aŭ sintezon) de \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "kontrolante la publikan ĉifroŝlosilon de \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importis ĉifroŝlosilon %s de \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne povis importi la publikan ĉifroŝlosilon de \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "aldonita datenportilo %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "ricevo de [%s] malsukcesis"
@@ -1194,94 +1204,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "mi legas la rpm-dosierojn de [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyJj"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Bedaŭrinde, nevalida elekto, reprovu\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pakaĵo"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versio"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Eldono"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arch"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "foriganta datenportilon \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1364,297 +1379,6 @@ msgstr "muntas %s"
 msgid "unmounting %s"
 msgstr "malmuntas %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"mdkupdate versio %s\n"
-"Kopirajto © 2002-2004 Mandriva.\n"
-"Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
-"GNU GPL.\n"
-"\n"
-"uzado:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - presu tiun ĉi help-mesaĝon.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - uzu specifan medion (tipe estas cim-raporto).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - ne uzu la donitan datenportilon, disigitan per komo.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - vicigu la datenportilojn laŭ subĉenoj disigitaj per "
-"komo.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ne printu identajn liniojn.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - uzu nur ĝisdatigajn datenportilojn.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - babilema modo.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - anigu perl-kodon rekte kiel perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binara KAJ-operatoro.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binara AŬ-operatoro.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unuloka NE.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - dekstra parentezo por fermi grup-esprimon.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - uzu X-interfacon.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    defaŭlte al %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - presu url-on de etikedo: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - printu etikedon buildhost: build host.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Agordo de Konzolo"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - printu etikedan priskribon: description.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - printu etikedon epoĥo: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - listigu dosierojn en la pakaĵo.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - printu etikedo-grupon: group.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - printu etiked-pakilon: packager.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - presu etikedan provizon: ĉiuj provizoj.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - printu etikedan postulojn: ĉiujn postulojn.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - printu grandecon de etikedo: size.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - printu etikedon sourcerpm: source rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --group         - printu etikedan resumon: summary.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - presu url-on de etikedo: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - babilema modo.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - listigu dosierojn en la pakaĵo.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - printu version, eldonon kaj arkitekturon kun nomo.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "Nenia xml-informo havebla por portilo \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1671,7 +1395,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Neniu pakaĵo nomata %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
@@ -1681,47 +1405,47 @@ msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "La pakaĵoj estas jam instalitaj"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "La pakaĵo %s estas jam instalita"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "La pakaĵoj %s estas jam instalitaj"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "pro mankanta %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "La pakaĵo %s estas jam instalita"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "pro neplenumita %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "mi provas disponigi %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "por konservi %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1730,7 +1454,7 @@ msgstr ""
 "La sekvanta pakaĵo estas forigota por ke aliaj estu ĝisdatigotaj:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1739,12 +1463,12 @@ msgstr ""
 "La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "por instali %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "pro konflikto kun %s"
@@ -1838,6 +1562,13 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1865,39 +1596,39 @@ msgstr "  --verbose      - babilema modo.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - elektu ĉiujn pakaĵojn kongruajn kun la esprimo.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Nur superuzulo rajtas forpreni pakaĵojn"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "nekonataj pakaĵoj"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "nekonata pakaĵo"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "forigi pakaĵon %s detruos vian sistemon"
 msgstr[1] "forigi pakaĵon %s detruos vian sistemon"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nenio forigenda"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nenio forigenda"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1905,45 +1636,323 @@ msgid_plural ""
 msgstr[0] "Por plenumi dependaĵojn, la sekvanta pakaĵo estas forigota"
 msgstr[1] "Por plenumi dependaĵojn, la %d sekvantaj pakaĵoj estas forigotaj"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "nekonata pakaĵo"
 msgstr[1] "nekonata pakaĵo"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Malinstalu %d pakaĵon?"
 msgstr[1] "Malinstalu %d pakaĵojn?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (J/n) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "prenante moveblan aparaton kiel \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Forigado malsukcesis"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Forigado malsukcesis"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"mdkupdate versio %s\n"
+"Kopirajto © 2002-2004 Mandriva.\n"
+"Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
+"GNU GPL.\n"
+"\n"
+"uzado:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - presu tiun ĉi help-mesaĝon.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - uzu specifan medion (tipe estas cim-raporto).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - ne uzu la donitan datenportilon, disigitan per komo.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - vicigu la datenportilojn laŭ subĉenoj disigitaj per "
+"komo.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ne printu identajn liniojn.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - uzu nur ĝisdatigajn datenportilojn.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - babilema modo.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - anigu perl-kodon rekte kiel perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binara KAJ-operatoro.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binara AŬ-operatoro.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unuloka NE.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - dekstra parentezo por fermi grup-esprimon.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - uzu X-interfacon.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    defaŭlte al %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - presu url-on de etikedo: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - printu etikedon buildhost: build host.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Agordo de Konzolo"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - printu etikedan priskribon: description.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - printu etikedon epoĥo: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - listigu dosierojn en la pakaĵo.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - printu etikedo-grupon: group.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - printu etiked-pakilon: packager.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - presu etikedan provizon: ĉiuj provizoj.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - printu etikedan postulojn: ĉiujn postulojn.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - printu grandecon de etikedo: size.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - printu etikedon sourcerpm: source rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --group         - printu etikedan resumon: summary.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - presu url-on de etikedo: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - babilema modo.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - listigu dosierojn en la pakaĵo.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - printu version, eldonon kaj arkitekturon kun nomo.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "Nenia xml-informo havebla por portilo \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2288,48 +2297,43 @@ msgstr ""
 "Eraro: %s ŝajnas esti nur legebla.\n"
 "Uzu --allow-force por provi skribadon."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (ĝisdatigi)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (ĝisdatigi)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (instali)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (instali)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Por plenumi dependaĵojn, la sekvanta pakaĵo estas forigota"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Kiu estas via elekto? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2341,7 +2345,7 @@ msgstr ""
 "kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2353,19 +2357,19 @@ msgstr ""
 "kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Ĉu mi devus daŭri malgraŭe?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2374,7 +2378,7 @@ msgstr ""
 "Iuj postulataj pakaĵoj ne instaleblas:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2383,12 +2387,12 @@ msgstr ""
 "Iuj postulataj pakaĵoj ne instaleblas:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "forigi pakaĵon %s detruos vian sistemon"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2399,7 +2403,7 @@ msgstr ""
 "forigotas por ke aliaj estu ĝisdatigotaj:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2410,12 +2414,12 @@ msgstr ""
 "forigotas por ke aliaj estu ĝisdatigotaj:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2425,46 +2429,46 @@ msgstr ""
 "Vi devas esti root por instali la sekvantajn dependaĵojn:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Por plenumi dependaĵojn, la sekvanta pakaĵo estas forigota"
 msgstr[1] "Por plenumi dependaĵojn, la %d sekvantaj pakaĵoj estas forigotaj"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s da kroma diskospaco estos uzata."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s da diskospaco estos liberigitaj."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s da pakaĵoj estos ricevitaj."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Premu la enigklavon kiam vi pretas..."
@@ -2900,12 +2904,12 @@ msgstr "  -f             - trudu ĝisdatigon de sintezo/hdlist-dosieroj.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Nur superuzulo rajtas ĝisdatigi pakaĵojn"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nenio por ĝisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2914,17 +2918,17 @@ msgstr ""
 "la enskribaĵo por ĝisgatigi mankas\n"
 "(unu el %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "preterlasante datenportilon \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "ebligante datenportilon \"%s\""
diff --git a/po/es.po b/po/es.po
index 5ed2c6d1..656b9aa6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-21 14:11+0200\n"
 "Last-Translator: José Manuel Pérez <jmprodu@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -28,22 +28,22 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Instalación de RPMs"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Error: no se puede encontrar el archivo %s, se cancelará la operación"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "¿Qué desea hacer?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -80,7 +80,7 @@ msgstr ""
 "\n"
 "¿Continuar?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -96,22 +96,22 @@ msgstr ""
 "\n"
 "Puede que prefiera sólo guardarlo. ¿Cuál es su elección?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instalar"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Elija ubicación para guardar archivo"
@@ -219,12 +219,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Ningún paquete especificado"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Por favor, espere..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Debe ser root"
@@ -255,42 +255,42 @@ msgstr ""
 "%s\n"
 "¿Continuar a pesar de todo?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (para actualizar)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (para instalar)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Elección de paquetes"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Uno de los paquetes siguientes es necesario:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -301,57 +301,64 @@ msgstr ""
 "%s\n"
 "¿Continuar a pesar de todo?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Para satisfacer las dependencias, se instalará el paquete siguiente"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Para satisfacer las dependencias, se instalarán los paquetes siguientes:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paquete, %d MB)"
 msgstr[1] "(%d paquetes, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no se pueden obtener los paquetes fuente, abortando"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando paquete `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Por favor, inserte el soporte denominado «%s»"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Descargando paquete `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...falló la recuperación: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Hecho"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -362,28 +369,27 @@ msgstr ""
 "%s\n"
 "Puede querer actualizar su base de datos de urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Falló la instalación:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "ya está todo instalado"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Finalizó la instalación"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "quitando %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
@@ -457,58 +463,52 @@ msgstr "El directorio de entorno %s no existe"
 msgid "using specific environment on %s\n"
 msgstr "uasando un entorno específico en %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "no se puede abrir rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nombre de archivo rpm no válido [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "obteniendo archivo rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...recuperación hecha"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...falló la recuperación: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no se puede acceder al archivo rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "no se pudo interpretar el archivo spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "no se puede registrar el archivo rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Arquitectura incompatible para el rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "error registrando paquetes locales"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Esta operación está prohibida en modo restringido"
@@ -550,22 +550,22 @@ msgstr ""
 "de manera predeterminada urpmf espera una regexp. Debería usar la opción «--"
 "literal»"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "el directorio chroot no existe"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "No se puede usar %s sin %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "No se puede usar %s con %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
@@ -660,82 +660,87 @@ msgstr "%s falló: salió con la señal %d"
 msgid "%s failed: exited with %d"
 msgstr "%s falló: salió con %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "falló la copia"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "falta wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "falta curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl falló: descarga cancelada\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "falta rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "falta ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "falta prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "No se pudo ejecutar prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "falta aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% de %s completo, ETA = %s, velocidad = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% completo, velocidad = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "descargando %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "descargados %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocolo desconocido definido para %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "no se encontró webfetch, los webfetch soportados son: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "no se puede manejar el protocolo: %s"
@@ -755,12 +760,12 @@ msgstr "no se encontró el paquete %s."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "obteniendo archivos rpm desde el soporte  «%s» ..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[reempaquetado]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -768,47 +773,47 @@ msgstr ""
 "transacción creada para instalar sobre %s (quitar=%d, instalar=%d, "
 "actualizar=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "no se puede crear transacción"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "no se puede extraer el rpm del paquete delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "no se puede instalar el paquete %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "quitando rpm no válido (%s) desde %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "falló la eliminación de %s: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Quitando paquete %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "quitando paquete %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "quitando rpms instalados (%s) desde %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Más información sobre el paquete %s"
@@ -854,18 +859,23 @@ msgid "%s database is locked (another program is already using it)"
 msgstr ""
 "la base de datos %s está bloqueada (está siendo usada por otro programa)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "¿Intenta continuar de todas formas? (s/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -874,57 +884,57 @@ msgstr ""
 "Falló la instalación, rpms no válidos:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "El siguiente paquete contienen una firma no válida"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Los siguientes paquetes contienen firmas no válidas"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "¿Desea continuar con la instalación?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "quitando rpms instalandos (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuyendo %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalando %s desde %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instalando %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Los paquetes están actualizados"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Es posible la instalación"
@@ -1131,7 +1141,7 @@ msgstr "falló la copia de [%s] (el archivo es sospechosamente pequeño)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "computando md5sum del synthesis fuente descargado"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "falló la descarga de [%s] (no coincide md5sum)"
@@ -1171,32 +1181,32 @@ msgstr "no se encuentra el archivo synthesis para el soporte «%s»"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "descargando synthesis fuente de «%s»..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinando archivo de clave pública de «%s»..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... se importó clave %s desde archivo de clave pública de «%s»"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no se puede importar archivo de clave pública de «%s»"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "no se encuentra el archivo synthesis para el soporte «%s»"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "soporte «%s» actualizado"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "falló la descarga de [%s]"
@@ -1211,94 +1221,99 @@ msgstr "intentando otra vez con el sitio de réplica %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "No se pudo encontrar una ráplica en la lista de réplicas %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "se encontró la geolocalización %s %.2f %.2f para el huso horario %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "obteniendo lista de réplicas desde %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Disculpe, elección incorrecta, reinténtelo\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Paquete"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versión"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Revisión"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arq."
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(sugerido)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "soporte «%s»"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "línea de comandos"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1306,7 +1321,9 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "El paquete siguiente ahora quedó huérfano, utilice \"urpmi --auto-orphans\" para quitarlo."
+msgstr[0] ""
+"El paquete siguiente ahora quedó huérfano, utilice \"urpmi --auto-orphans\" "
+"para quitarlo."
 msgstr[1] ""
 "Los paquetes siguientes ahora quedaron huérfanos, utilice \"urpmi --auto-"
 "orphans\" para quitarlos."
@@ -1385,316 +1402,6 @@ msgstr "montando %s"
 msgid "unmounting %s"
 msgstr "desmontando %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urmpf versión %s\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [opciones] patrón-expresión\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - mostrar el número de versión de esta herramienta.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - usar entorno específico (típicamente para reportar "
-"bugs).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - no usar soportes dados, separados por coma.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - no coincidir con patrones, usar argumento de manera "
-"literal.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - usar otra raíz para la instalación de rpm y la base de "
-"datos de urpmi.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - clasificar soportes de acuerdo a subcadenas separadas por "
-"coma.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - usar la ruta dada para acceder a los soportes\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - usar síntesis provista en lugar de base de datos de "
-"urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - no imprime líneas idénticas.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - usa sólo soporte de actualización.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modo informativo.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignora distinción entre mayús. y minús. en los patrones.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - hace la distinción entre mayús. y minús. en los "
-"patrones.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-"  -F<cad>        - cambiar el separador de campos (':' es el predet.)\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Expresiones de patrón:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  texto           - cualquier texto se toma como regexp, a menos que se use -"
-"l.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - incluye código Perl directamente como perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operador binario Y.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operador O binario.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NO unario.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  ( )            - paréntesis izq. y der. para grupos de expresiones.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Lista de etiquetas:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - especificar un formato de salida estilo printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   ejemplo: '%%nombre:%%archivos'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arquitectura\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - máquina en la que se compiló.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - hora de compilación\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - archivos de configuración\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - imprime conflictos\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr ""
-"  --description   - descripción del paquete\n"
-"\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribución\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr ""
-"  --epoch        - época\n"
-"\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr ""
-"  --filename     - nombre de archivo del paquete\n"
-"\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - lista de archivos contenidos en el paquete\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grupo\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licencia\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - nombre del paquete\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - todo lo obsoleto\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - quien lo empaquetó\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - lo que proporciona\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - lo que necesita\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - tamaño instalado\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nombre del rpm fuente\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - lo que sugiere\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - resumen\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - fabricante\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - el soporte en el que se encontró el paquete\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - imprime versión, release y arquitectura con nombre.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Formato incorrecto: debe usar sólo una etiqueta multi-valor"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "no hay hdlist para el soporte «%s»"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "no hay synthesis para el soporte «%s»"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "no hay xml-info para el soporte «%s»"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1712,7 +1419,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Ningún paquete llamado %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Los siguientes paquetes contienen %s: %s"
@@ -1722,49 +1429,49 @@ msgstr "Los siguientes paquetes contienen %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Debería usar \"-a\" para utilizarlos a todos"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 "se encontraron los paquetes %s en la base de datos de urpmi, pero ninguno "
 "está instalado"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "El paquete %s ya está instalado"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Los paquetes %s ya están instalados"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "debido a que falta %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "debido a que ya está instalado %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "debido a que no se satisfizo %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "intentando promover %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "para mantener %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1773,7 +1480,7 @@ msgstr ""
 "Se tiene que quitar el paquete siguiente para poder actualizar otros:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1782,12 +1489,12 @@ msgstr ""
 "Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "para instalar %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "debido a conflictos con %s"
@@ -1883,6 +1590,14 @@ msgstr "  --repackage    - Volver a empaquetar los archivos antes de borrar\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usar otra raíz para la desinstalación de rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - usar otra raíz para la instalación de rpm y la base de "
+"datos de urpmi.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1916,39 +1631,39 @@ msgstr ""
 "  -a             - selecciona todas los paquetes que coincidan con la "
 "expresión.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Sólo el superusuario está autorizado a quitar paquetes"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "paquetes desconocidos "
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "paquete desconocido "
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Quitar el paquete siguiente dañará su sistema:"
 msgstr[1] "Quitar los paquetes siguientes dañará su sistema:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nada que quitar"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "No hay huérfanos para quitar"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1957,45 +1672,341 @@ msgstr[0] "Para satisfacer las dependencias, se quitará el paquete siguiente"
 msgstr[1] ""
 "Para satisfacer las dependencias, se quitarán los %d paquetes siguientes"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(paquete huérfano)"
 msgstr[1] "(paquetes huérfanos)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "¿Quitar %d paquete?"
 msgstr[1] "¿Quitar %d paquetes?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "probando la remoción de %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Falló la desinstalación"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Se puede quitar"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urmpf versión %s\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
+"GPL.\n"
+"\n"
+"usage: urpmf [opciones] patrón-expresión\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - mostrar el número de versión de esta herramienta.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - usar entorno específico (típicamente para reportar "
+"bugs).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - no usar soportes dados, separados por coma.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - no coincidir con patrones, usar argumento de manera "
+"literal.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - clasificar soportes de acuerdo a subcadenas separadas por "
+"coma.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - usar la ruta dada para acceder a los soportes\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - usar síntesis provista en lugar de base de datos de "
+"urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - no imprime líneas idénticas.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - usa sólo soporte de actualización.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modo informativo.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignora distinción entre mayús. y minús. en los patrones.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - hace la distinción entre mayús. y minús. en los "
+"patrones.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+"  -F<cad>        - cambiar el separador de campos (':' es el predet.)\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Expresiones de patrón:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  texto           - cualquier texto se toma como regexp, a menos que se use -"
+"l.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - incluye código Perl directamente como perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operador binario Y.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operador O binario.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NO unario.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  ( )            - paréntesis izq. y der. para grupos de expresiones.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Lista de etiquetas:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - especificar un formato de salida estilo printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   ejemplo: '%%nombre:%%archivos'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arquitectura\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - máquina en la que se compiló.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - hora de compilación\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - archivos de configuración\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - imprime conflictos\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr ""
+"  --description   - descripción del paquete\n"
+"\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribución\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr ""
+"  --epoch        - época\n"
+"\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr ""
+"  --filename     - nombre de archivo del paquete\n"
+"\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - lista de archivos contenidos en el paquete\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grupo\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licencia\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - nombre del paquete\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - todo lo obsoleto\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - quien lo empaquetó\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - lo que proporciona\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - lo que necesita\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - tamaño instalado\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nombre del rpm fuente\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - lo que sugiere\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - resumen\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - fabricante\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - el soporte en el que se encontró el paquete\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - imprime versión, release y arquitectura con nombre.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "expresión no terminada (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Formato incorrecto: debe usar sólo una etiqueta multi-valor"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "no hay hdlist para el soporte «%s»"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "no hay synthesis para el soporte «%s»"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "no hay xml-info para el soporte «%s»"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2357,36 +2368,31 @@ msgstr ""
 "Error: %s parece estar montado como sólo lectura.\n"
 "Use --allow-force para forzar la operación"
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Actualizando soportes...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (para actualizar)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (para actualizar)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (para instalar)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (para instalar)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2395,12 +2401,12 @@ msgstr ""
 "Para satisfacer la dependencia «%s», se necesita uno de los paquetes "
 "siguientes:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "¿Qué elige? (1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2411,7 +2417,7 @@ msgstr ""
 "más antiguos que los ya instalados:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2422,7 +2428,7 @@ msgstr ""
 "más antiguos que los ya instalados:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2431,12 +2437,12 @@ msgstr ""
 "\n"
 "¿Seguir adelante con la instalación?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2445,7 +2451,7 @@ msgstr ""
 "No se puede instalar el paquete pedido:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2454,12 +2460,12 @@ msgstr ""
 "No se puede instalar algunos paquetes pedidos:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "quitar el paquete %s dañará su sistema"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2470,7 +2476,7 @@ msgstr ""
 "siguiente para poder actualizar otros:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2481,12 +2487,12 @@ msgstr ""
 "siguientes para poder actualizar otros:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(sólo prueba, no se llevará a cabo la desinstalación)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2497,46 +2503,46 @@ msgstr ""
 "dependencias siguientes:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Se quitará el paquete huérfano siguiente."
 msgstr[1] "Se quitarán los paquetes huérfanos siguientes."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(sólo prueba, no se llevará a cabo la instalación)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "se utilizarán %s de espacio de disco adicional."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "se liberará %s de espacio de disco."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "se descargarán %s de paquetes."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "¿Efectuar la instalación del paquete?"
 msgstr[1] "¿Efectuar la instalación de los %d paquetes?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Presione «Intro» cuando el soporte sté montado..."
@@ -2999,12 +3005,12 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Sólo el superusuario está autorizado a actualizar soportes"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3013,17 +3019,17 @@ msgstr ""
 "falta la entrada a actualizar\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "Ignorando soporte %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "activando el soporte %s"
@@ -3315,6 +3321,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "No se encontró changelog\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Actualizando soportes...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "examinando archivo %s"
 
diff --git a/po/et.po b/po/et.po
index 9538020b..202a7d7c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-08-30 12:48+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-i paigaldamine"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Viga: faili %s ei leitud, toiming katkestatakse"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Olgu"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 "Mida nüüd ette võtta?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -68,7 +68,7 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -83,22 +83,22 @@ msgstr ""
 "\n"
 "Võib-olla soovite siiski seda lihtsalt salvestada? Mida ette võtta?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Paigalda"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Loobu"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Valige faili salvestamise koht"
@@ -206,12 +206,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Pakette pole valitud"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Palun oodake..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Vajalikud on administraatori õigused"
@@ -242,42 +242,42 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (uuendus)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (paigaldus)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Paketivalik"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Katkesta"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -288,56 +288,63 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakett, %d MB)"
 msgstr[1] "(%d paketti, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "pakette ei õnnestunud hankida, katkestatakse"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Palun sisestage andmekandja nimega \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Paketi '%s' allalaadimine..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...tõmbamine nurjus: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Tehtud"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -348,28 +355,27 @@ msgstr ""
 "%s\n"
 "Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Paigaldamine nurjus:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Kõik on juba paigaldatud"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Paigaldus lõpetatud"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s eemaldamine"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
@@ -444,58 +450,52 @@ msgstr "Keskkonna kataloogi %s ei ole olemas"
 msgid "using specific environment on %s\n"
 msgstr "spetsiifilise keskkonna kasutamine %s puhul\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb avamine nurjus"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "vigane RPM-faili nimi [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-faili [%s] tõmbamine..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...tõmbamine nurjus: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ligipääs RPM-failile [%s] nurjus"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "spetsifikatsioonifaili %s parsimine nurjus [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-faili registreerimine nurjus"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Sobimatu arhitektuur RPM-ile [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "viga kohalike pakettide registreerimisel"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "See operatsioon on piiratud režiimis keelatud"
@@ -536,22 +536,22 @@ msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "vaikimisi ootab urpmf regulaaravaldist, peaksite kasutama võtit \"--literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kataloogi ei ole olemas"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s kasutamine ei ole võimalik %s-ga"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
@@ -645,82 +645,87 @@ msgstr "%s nurjus: lõpetas signaaliga %d"
 msgid "%s failed: exited with %d"
 msgstr "%s nurjus: lõpetas %d-ga"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "kopeerimine nurjus"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget puudub\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl puudub\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl nurjus: allalaadimine katkestati\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync puudub\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh puudub\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla puudub\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Prozilla käivitamine nurjus\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 puudub\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% %s-st valmis, aega jäänud: %s, kiirus: %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% valmis, kiirus: %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "%s tõmbamine"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "tõmmati %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "tundmatu protokoll %s jaoks"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ei suuda käsitleda protokolli: %s"
@@ -740,59 +745,59 @@ msgstr "paketti %s ei leitud."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM-failide tõmbamine andmekandjalt \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[taaspakendamine]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "tehing %s paigaldamiseks loodud (eemaldus=%d, paigaldus=%d, uuendus=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "tehingu loomine nurjus"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "RPM-i ekstraktimine delta-rpm-paketist %s nurjus"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "paketi %s paigaldamine nurjus"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "vigase RPM-faili (%s) eemaldamine %s-st"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "%s eemaldamine nurjus: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Paketi %s eemaldamine"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "paketi %s eemaldamine"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "paigaldatud RPM-failide (%s) eemaldamine %s-st"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Rohkem infot paketi %s kohta"
@@ -837,18 +842,23 @@ msgstr "loobutakse"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s andmebaas on lukus (seda kasutab teine programm)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Paigaldamine nurjus"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Kas proovida siiski jätkata? (j/E)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -857,57 +867,57 @@ msgstr ""
 "Paigaldamine nurjus, vigased RPM-failid:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Järgmisel paketil on vigane signatuur"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Järgmistel pakettidel on vigane signatuur"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Kas jätkata paigaldusega?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "paigaldatud RPM-failide (%s) eemaldamine"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "%s jaotamine"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s paigaldamine andmekandjalt %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s paigaldamine"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pole ühtegi paketti uuendada"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Paigaldamine on võimalik"
@@ -1112,7 +1122,7 @@ msgstr "[%s] kopeerimine nurjus (fail on kahtlaselt väike)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "tõmmatud allika sünteesifaili MD5SUM arvutamine"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] tõmbamine nurjus (MD5SUM ei klapi)"
@@ -1152,32 +1162,32 @@ msgstr "andmekandjale \"%s\" ei leitud metaandmeid"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" allika sünteesifaili tõmbamine..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" avaliku võtme faili uurimine..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" avaliku võtme faili import nurjus"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uuendati andmekandjat \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] tõmbamine nurjus"
@@ -1192,94 +1202,99 @@ msgstr "püütakse uuesti peegliga %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Peeglite nimekirjas %s ei leitud peeglit"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "leiti geolokatsioon %s %.2f %.2f ajavööndist %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "%s peeglite nimekirja lugemine"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "EeNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/E) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pakett"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versioon"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Väljalase"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arhit."
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(pakkumine)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "andmekandja \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "käsurida"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1368,307 +1383,6 @@ msgstr "%s haakimine"
 msgid "unmounting %s"
 msgstr "%s lahutamine"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf versioon %s\n"
-"Autoriõigus (C) 2002-2006 Mandriva.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine: urpmf [võtmed] pattern-expression\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - näitab programmi versiooni.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
-"                   vearaportideks).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia        - ei kasutata määratud andmekandjaid (eraldajaks "
-"koma).\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - mustrina tõlgendamise asemel kasutatakse argumenti "
-"täpselt esitatud kujul.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - muu baasi kasutamine urpmi andmebaasi jaoks ja RPM-ide "
-"paigaldamisel.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
-"koma).\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --use-distrib  - andmekandja kasutamiseks kasutatakse määratud asukohta.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - selgitav režiim.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - tõstutundetu igas olukorras.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - tõstu arvestamine mustrites (vaikimisi).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - väljade eraldaja muutmine (vaikimisi ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Mustriavaldised:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - suvalist teksti parsitakse regulaaravaldisena, kui ei "
-"kasutata võtit -l.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binaaroperaator AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binaaroperaator OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unaaroperaator NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - parem- ja vasakpoolne sulg.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Siltide nimekiri:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - printf laadis vormindatud väljund\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   näide: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arhitektuur\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - valmistajamasin\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - valmistamisaeg\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - konfiguratsioonifailid\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - konfliktide sildid\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - paketi kirjeldus\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distributsioon\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epohh\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - paketi failinimi\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - paketi failide nimekiri\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grupp\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - litsents\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - paketi nimi\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - iganenute sildid\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - paketi valmistaja\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - pakutavate sildid\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - nõutavate sildid\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - paigalduse suurus\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - lähtekoodi RPM-i nimi\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - pakkumiste sildid\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - kokkuvõte\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - tootja\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - paketti sisaldav andmekandja\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - näitab koos nimega versiooni, väljalaset ja "
-"arhitektuuri.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Vigane vorming: kasutada tohib ainult üht mitme väärtusega silti"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "andmekandjale \"%s\" ei leitud hdlist-faili"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "andmekandjale \"%s\" ei leitud XML-infot"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1688,7 +1402,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Paketti nimega %s ei ole"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s sisaldub järgmistes pakettides: %s"
@@ -1698,47 +1412,47 @@ msgstr "%s sisaldub järgmistes pakettides: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Kõigi nende kasutamiseks tuleks anda \"-a\""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Urpmi andmebaasis leiti paketid %s, aga need ei ole paigaldatud"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakett %s on juba paigaldatud"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketid %s on juba paigaldatud"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "puuduva %s tõttu"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "juba paigaldatud %s tõttu"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "rahuldamata %s tõttu"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "püüdes välja pakkuda %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "säilitamaks %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1747,7 +1461,7 @@ msgstr ""
 "Teiste uuendamiseks tuleb eemaldada järgmine pakett:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1756,12 +1470,12 @@ msgstr ""
 "Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "paigaldamaks %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "konflikti tõttu %s-ga"
@@ -1857,6 +1571,14 @@ msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - muu baasi kasutamine urpmi andmebaasi jaoks ja RPM-ide "
+"paigaldamisel.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1888,39 +1610,39 @@ msgstr "  --verbose, -v  - selgitav režiim.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Tarkvara võib eemaldada ainult administraator"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "tundmatud paketid"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "tundmatu pakett"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Järgmise paketi eemaldamine halvab Teie süsteemi:"
 msgstr[1] "Järgmiste pakettide eemaldamine halvab Teie süsteemi:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Pole midagi eemaldada"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Pole ühtegi orbu eemaldada"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1928,45 +1650,332 @@ msgid_plural ""
 msgstr[0] "Sõltuvuste lahendamiseks tuleb eemaldada järgmine pakett"
 msgstr[1] "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(orvust pakett)"
 msgstr[1] "(orvust paketid)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Kas eemaldada %d pakett?"
 msgstr[1] "Kas eemaldada %d paketti?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (j/E) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "%s eemaldamise test"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Eemaldamine nurjus"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Eemaldamine on võimalik"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf versioon %s\n"
+"Autoriõigus (C) 2002-2006 Mandriva.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine: urpmf [võtmed] pattern-expression\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - näitab programmi versiooni.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
+"                   vearaportideks).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia        - ei kasutata määratud andmekandjaid (eraldajaks "
+"koma).\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - mustrina tõlgendamise asemel kasutatakse argumenti "
+"täpselt esitatud kujul.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
+"koma).\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --use-distrib  - andmekandja kasutamiseks kasutatakse määratud asukohta.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - selgitav režiim.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - tõstutundetu igas olukorras.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - tõstu arvestamine mustrites (vaikimisi).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - väljade eraldaja muutmine (vaikimisi ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Mustriavaldised:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - suvalist teksti parsitakse regulaaravaldisena, kui ei "
+"kasutata võtit -l.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binaaroperaator AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binaaroperaator OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unaaroperaator NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - parem- ja vasakpoolne sulg.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Siltide nimekiri:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - printf laadis vormindatud väljund\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   näide: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arhitektuur\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - valmistajamasin\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - valmistamisaeg\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - konfiguratsioonifailid\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - konfliktide sildid\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - paketi kirjeldus\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distributsioon\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epohh\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - paketi failinimi\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - paketi failide nimekiri\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grupp\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - litsents\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - paketi nimi\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - iganenute sildid\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - paketi valmistaja\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - pakutavate sildid\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - nõutavate sildid\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - paigalduse suurus\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - lähtekoodi RPM-i nimi\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - pakkumiste sildid\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - kokkuvõte\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - URL\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - tootja\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - paketti sisaldav andmekandja\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - näitab koos nimega versiooni, väljalaset ja "
+"arhitektuuri.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "lõpetamata avaldis (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Vigane vorming: kasutada tohib ainult üht mitme väärtusega silti"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "andmekandjale \"%s\" ei leitud hdlist-faili"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "andmekandjale \"%s\" ei leitud XML-infot"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2319,48 +2328,43 @@ msgstr ""
 "Viga: %s paistab olevat haagitud ainult loetavana.\n"
 "Kasutage operatsiooni pealesundimiseks võtit --allow-force."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Andmekandja uuendamine...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uuendus)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uuendus)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (paigaldus)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (paigaldus)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Sõltuvuse '%s' lahendamiseks on vajalik üks järgmistest pakettidest:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Millise valite? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2371,7 +2375,7 @@ msgstr ""
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2382,7 +2386,7 @@ msgstr ""
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2391,12 +2395,12 @@ msgstr ""
 "\n"
 "Kas siiski paigaldamist jätkata?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2405,7 +2409,7 @@ msgstr ""
 "Soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2414,12 +2418,12 @@ msgstr ""
 "Mõnda soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketi %s eemaldamine halvab Teie süsteemi"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2430,7 +2434,7 @@ msgstr ""
 "järgmine pakett:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2441,12 +2445,12 @@ msgstr ""
 "järgmised paketid:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei eemaldata)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2457,46 +2461,46 @@ msgstr ""
 "buildrequires:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Eemaldatakse järgmine orvust pakett."
 msgstr[1] "Eemaldatakse järgmised orvust paketid."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei paigaldata)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Kasutusele võetakse veel %s kettaruumi."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Vabaneb %s kettaruumi."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Tõmmatakse %s andmeid."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Kas paigaldada 1 pakett?"
 msgstr[1] "Kas paigaldada %d paketti?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Vajutage Enter, kui see on tehtud..."
@@ -2964,12 +2968,12 @@ msgstr "  -f             - sunnib jõuga uuendama sünteestifaile.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Andmekandjaid võib uuendada ainult administraator"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2978,17 +2982,17 @@ msgstr ""
 "puudub uuendatava kirje nimi\n"
 "(võimalikud: %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "andmekandja %s ignoreerimine"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "andmekandja %s arvestamine"
@@ -3271,6 +3275,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Muutuste logi ei leitud\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Andmekandja uuendamine...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "%s faili uurimine"
 
diff --git a/po/eu.po b/po/eu.po
index af4fbcac..9258a6a3 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-08 08:52+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <eu@li.org>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM instalaketa"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Akatsa: ezin da %s fitxategia aurkitu, eragiketa galaraziko da"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ados"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -55,7 +55,7 @@ msgstr ""
 "\n"
 "Zer egin nahi duzu?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "Jarraitu?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -85,22 +85,22 @@ msgstr ""
 "\n"
 "Baliteke gordetzea bakarrik nahi izatea. Zer egin nahi duzu?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instalatu"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Gorde"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Aukeratu fitxategiko gordetzeko kokalekua"
@@ -144,15 +144,18 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
 "hautatzen ditu\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
 
 #: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
@@ -174,7 +177,8 @@ msgstr ""
 #: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p     - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
+msgstr ""
+"  -p     - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
 
 #: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
@@ -191,11 +195,13 @@ msgstr "  --root         - beste root bat erabiltzen du rpm instalatzeko.\n"
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
-msgstr "  --test         - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
+msgstr ""
+"  --test         - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - soilik adierazitako euskarria erabiltzen du eskatutako "
 "paketeak bilatzeko.\n"
@@ -205,12 +211,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Ez da paketerik zehaztu"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Itxaron mesedez..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Root izan behar da"
@@ -241,42 +247,42 @@ msgstr ""
 "%s\n"
 "Instalazioarekin jarraitu hala ere?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ados"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (Eguneratu)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (instalatu)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Paketa aukera"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ondoko paketeetako bat behar da:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Geldiarazi"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -287,54 +293,63 @@ msgstr ""
 "%s\n"
 "Instalazioarekin jarraitu hala ere?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Mendekotasunak asetzeko, ondorengo paketea instalatuko da:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(pakete %d, %d MB)"
 msgstr[1] "(%d pakete, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Prestatzen..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketea instalatzen (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Mesedez, sartu \"%s\" izeneko euskarria"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' paketea deskargatzen..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...berreskuratzeak huts egin du: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Eginda"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -345,28 +360,27 @@ msgstr ""
 "%s\n"
 "Zure urpmi datu-basea eguneratzea komeni da"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalaketak huts egin du:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Dena dago instalatuta"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalazioa amaitu da"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s kentzen"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi berrabiarazten"
@@ -440,58 +454,52 @@ msgstr "%s ingurune direktorioa ez da existitzen"
 msgid "using specific environment on %s\n"
 msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ezin da rpmdb ireki"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "rpm fitxategi-izen baliogabea [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "[%s] rpm fitxategia berreskuratzen..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...berreskuratu da"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...berreskuratzeak huts egin du: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ezin izan da rpm fitxategia atzitu [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ezin da %s spec fitxategia sintaktikoki egiaztatu [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ezin da rpm fitxategia erregistratu"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "rpm-rentzako arkitektura bateraezina [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "errorea pakete lokalak erregistratzean"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Eragiketa hau debekatuta dago modu murriztuan exekutatzerakoan"
@@ -533,22 +541,22 @@ msgstr ""
 "era lehenetsian urpmf-k regexp bat espero du. \"--literal\" aukera erabili "
 "beharko zenuke"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot direktorioa ez da existitzen"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Ezin da %s %s gabe erabili"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Ezin da %s %s-rekin erabili"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Argumentu gehiegi\n"
@@ -610,7 +618,8 @@ msgstr "%s ez dago eskuragarri, %s erabiliko da"
 #: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "ezin proxy ezarpenak irakurri (behar adinako eskubiderik ez %s irakurtzeko)"
+msgstr ""
+"ezin proxy ezarpenak irakurri (behar adinako eskubiderik ez %s irakurtzeko)"
 
 #: ../urpm/download.pm:182
 #, c-format
@@ -642,82 +651,87 @@ msgstr "%s-k huts egin du: %d seinalearekin irten da"
 msgid "%s failed: exited with %d"
 msgstr "%s-k huts egin du: %d-rekin irten da"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "kopiak huts egin du"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget falta da\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl falta da\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl-ek huts egin du: deskarga galarazita\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync falta da\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh falta da\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla falta da\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Ezin izan da prozilla exekutatu\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 falta da\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% / %s osatuta, ETA = %s, abiadura = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% osatuta, abiadura = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "%s berreskuratzen"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "%s eskuratuta"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s(e)rako protokolo ezezaguna definitu da"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch ez da aurkitu, webfetch hauek onartzen dira: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ezin da protokoloa maneiatu: %s"
@@ -737,59 +751,60 @@ msgstr "ez da %s paketea aurkitu."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rpm fitxategiak berreskuratzen \"%s\" euskarritik..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[birpaketatzen]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "transakzioa sortu da %s(e)n instalatzeko (kendu=%d, instalatu=%d,eguneratu=%"
 "d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "ezin da transakziorik sortu"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ezin da rpm atera %s delta-rpm paketetik"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "ezin da %s paketea instalatu"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "(%s) rpm okerra %s-tik ezabatzen"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "%s ezabatzeak huts egin du: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "%s paketea ezabatzen"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "%s paketea kentzen"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "%2$s-n instalatutako rpm-ak (%1$s) ezabatzen"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Informazio gehiago %s paketeari buruz"
@@ -832,20 +847,26 @@ msgstr "galarazten"
 #: ../urpm/lock.pm:65
 #, c-format
 msgid "%s database is locked (another program is already using it)"
-msgstr "%s datubasea giltzatuta dago (beste programa bat hura erabiltzen ari da)"
+msgstr ""
+"%s datubasea giltzatuta dago (beste programa bat hura erabiltzen ari da)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Hala ere jarraitzen saiatu? (y/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -854,57 +875,57 @@ msgstr ""
 "Instalaketak huts egin du, rpm okerrak:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Ondoko paketeak sinadura okerra dauka"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Ondoko pakete hauek sinadura okerra dute"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Instalatzen jarraitu nahi duzu?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "instalatutako rpm-ak ezabatzen (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "%s banatzen"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s %s-tik instalatzen"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s instalatzen"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Indar handiagoz instalatzen saiatu (--force)? (b/E) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketeak egunean daude"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalazioa posible da"
@@ -917,7 +938,8 @@ msgstr "oharra: %s-rentzako md5sum ezin da eskuratu MD5SUM fitxategian"
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
+msgstr ""
+"\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -929,12 +951,14 @@ msgstr ""
 #: ../urpm/media.pm:213
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
-msgstr "ezin da \"%s\"(r)en synthesis fitxategia atzitu, euskarriari jaramonik ez"
+msgstr ""
+"ezin da \"%s\"(r)en synthesis fitxategia atzitu, euskarriari jaramonik ez"
 
 #: ../urpm/media.pm:240
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
-msgstr "existitzen den \"%s\" euskarriari jaramonik ez egiteko ahalegina, ekiditen"
+msgstr ""
+"existitzen den \"%s\" euskarriari jaramonik ez egiteko ahalegina, ekiditen"
 
 #: ../urpm/media.pm:456
 #, c-format
@@ -1110,7 +1134,7 @@ msgstr "ezin izan da [%s] kopiatu (fitxategia txikiegia da)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "berreskuratutako iturburu synthesis-en md5sum kalkulatzen"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s]-ren berreskuperaketak huts egin du (md5sum ez dator bat)"
@@ -1150,32 +1174,32 @@ msgstr "ez da \"%s\" euskarriaren metadaturik aurkitu"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\"-ren synthesis iturburua berreskuratzen..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\"(r)en gako publikoen fitxategia aztertzen..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%s gakoa inportatu da \"%s\"(r)en gako publikoen fitxategitik"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ezin da \"%s\"(r)en gako publikoen fitxategia inportatu"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ez da \"%s\" euskarriaren synthesis fitxategirik aurkitu"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "\"%s\" euskarri eguneratua"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] berreskurapenak huts egin du"
@@ -1190,94 +1214,99 @@ msgstr "%s ispiluarekin berriz saiatzen"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Ezin da ispilu bat aurkitu %s ispilu zerrendan"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "%s %.2f %.2f geokokapenak aurkitu dira %s ordugunetik"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "%s-tik ispilu zerrenda jasotzen"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "eEnN"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "bByYsS"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (b/E) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Aukera okerra, saiatu berriro\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Paketea"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Bertsioa"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Askapena"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arkitektura"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(iradokita)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "\"%s\" euskarria"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "komando lerroa"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1364,300 +1393,6 @@ msgstr "%s muntatzen"
 msgid "unmounting %s"
 msgstr "%s desmuntatzen"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf %s bertsioa\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"Software askea da hau eta GNU-ren GPL-k ezarritako baldintzak jarraituz "
-"birbanatu daiteke.\n"
-"\n"
-"erabilera: urpmf [aukerak] adierazpen-patroia\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - inprimatu tresna honen bertsio zenbakia.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - ingurune espezifikoa erabiltzen du (normalean\n"
-"                   errorearen berri ematea).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - ez parekatu patroi gisa, erabili argumentua hitzez hitz "
-"testu ilara gisa.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - erabili beste erro bat urpmi db eta rpm instalatzeko.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - euskarriak komaz bereizitako azpikateen arabera "
-"ordenatzen ditu.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - erabili emandako bidea euskarria atzitzeko\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ez inprimatu lerro berdinak.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - eguneratze-euskarria bakarrik erabiltzen du.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modu berritsua.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ereduetan ez bereiztu hizki larri eta xeheak.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - ereduetan hizki larri eta xeheak bereiztu (lehenetsia).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - aldatu eremu bakantzailea (lehenetsia ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Adierazpen patroiak:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - edozein testu regexp bezala aztertzen da, -l erabiltzen "
-"denean ezik..\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - perl kodea sartzen du zuzenean perl -e gisa.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - ETA eragile bitarra.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - EDO eragile bitarra.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - EZ unarioa.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - ezker eta eskuin parentesiak.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Etiketa zerrendak:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - printf-antzeko irteera formatua zehazten du\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   adibidez: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arkitektura\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - eraikuntza ostalaria\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - eraikuntza ordua\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - konfiguraketa fitxategiak\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - \"gatazka\" etiketak\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description - paketeen deskribapena\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - banaketa\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - garaia.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - paketearen fitxategi izena\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - paketeak biltzen dituen fitxategien izen zerrenda\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - taldea\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - lizentzia\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - pakete izena\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - \"zaharkituak\" etiketak\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - paketatzailea\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - \"hornitu\" etiketak.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - \"beharrezko\" etiketak\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - neurria instalatu ondoren\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - rpm iturburu izena.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - bilatu «suggests» bezala markatutakoen artean\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - laburpena\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - hornitzailea\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - paketea zeukan euskarria\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f - bertsioa, argitalpena eta fitxategia ere izenarekin inprimatzen "
-"ditu.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Formatu okerra: etiketa balio-anitz bakarra erabili dezakezu"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "ez dago \"%s\" euskarriarentzako hdlist eskuragarri"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "ez dago \"%s\" euskarriarentzako synthesis eskuragarri"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "ez dago \"%s\" euskarriarentzako xml-info eskuragarri"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1667,7 +1402,8 @@ msgstr ""
 
 #: ../urpm/select.pm:32
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 "urpmi berrabiatu egin da, eta lehentasuna duten paketeen zerrenda aldatu "
 "egin da: %s vs %s"
@@ -1677,7 +1413,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Ez dago %s izeneko paketerik"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Ondoko paketeek %s dute: %s"
@@ -1687,47 +1423,48 @@ msgstr "Ondoko paketeek %s dute: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "\"-a\" erabili behar zenuke guztiak erabiltzeko"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "%s paketea(k) aurkitu d(ir)a urpmi db-an, baino ez dago batere instalatuta"
+msgstr ""
+"%s paketea(k) aurkitu d(ir)a urpmi db-an, baino ez dago batere instalatuta"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "%s paketea dagoeneko instalatuta dago"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "%s paketeak dagoeneko instalatuta daude"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "%s falta delako"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "dagoeneko instalatutako %s dela eta"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s bete gabe dagoelako"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s jaso nahian"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s gordetzeko"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1736,7 +1473,7 @@ msgstr ""
 "Ondoko paketea ezabatu behar da besteak berritu ahal daitezen:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1745,12 +1482,12 @@ msgstr ""
 "Pakete hauek kendu egin behar dira besteak berritzeko:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s instalatzeko"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s(r)ekin gatazkak daudelako"
@@ -1842,6 +1579,13 @@ msgstr "  --repackage    - fitxategiak bir-paketatu ezabatu aurretik\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - beste root bat erabiltzen du rpm ezabaketarako.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - erabili beste erro bat urpmi db eta rpm instalatzeko.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1874,84 +1618,372 @@ msgstr ""
 "  -a             - pakete denak hautatzen ditu bat datozen adierazpenak "
 "kontuan hartuz.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Supererabiltzaileak soilik dauka paketeak ezabatzeko baimena"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pakete ezezagunak"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pakete ezezaguna"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Ondoko paketea kentzeak zure sistema apurtuko du:"
 msgstr[1] "Ondoko paketeak kentzeak zure sistema apurtuko du:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ez dago ezer kentzeko"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Ez dago ezabatu beharreko umezurtzik"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "Mendekotasunak asetzeko, ondoko paketea ezabatuko da"
 msgstr[1] "Mendekotasunak asetzeko, ondoko %d paketeak ezabatuko dira"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(pakete umezurtza)"
 msgstr[1] "(pakete umezurtzak)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%d paketea ezabatu?"
 msgstr[1] "%d paketeak ezabatu?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (b/E) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "%s ezabatzea probatzen"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Kentzean huts egin du"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Ezabatzea posible da"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf %s bertsioa\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"Software askea da hau eta GNU-ren GPL-k ezarritako baldintzak jarraituz "
+"birbanatu daiteke.\n"
+"\n"
+"erabilera: urpmf [aukerak] adierazpen-patroia\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - inprimatu tresna honen bertsio zenbakia.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - ingurune espezifikoa erabiltzen du (normalean\n"
+"                   errorearen berri ematea).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - ez parekatu patroi gisa, erabili argumentua hitzez hitz "
+"testu ilara gisa.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - euskarriak komaz bereizitako azpikateen arabera "
+"ordenatzen ditu.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - erabili emandako bidea euskarria atzitzeko\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ez inprimatu lerro berdinak.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - eguneratze-euskarria bakarrik erabiltzen du.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modu berritsua.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ereduetan ez bereiztu hizki larri eta xeheak.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - ereduetan hizki larri eta xeheak bereiztu (lehenetsia).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - aldatu eremu bakantzailea (lehenetsia ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Adierazpen patroiak:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - edozein testu regexp bezala aztertzen da, -l erabiltzen "
+"denean ezik..\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - perl kodea sartzen du zuzenean perl -e gisa.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - ETA eragile bitarra.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - EDO eragile bitarra.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - EZ unarioa.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - ezker eta eskuin parentesiak.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Etiketa zerrendak:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - printf-antzeko irteera formatua zehazten du\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   adibidez: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arkitektura\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - eraikuntza ostalaria\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - eraikuntza ordua\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - konfiguraketa fitxategiak\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - \"gatazka\" etiketak\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description - paketeen deskribapena\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - banaketa\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - garaia.\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - paketearen fitxategi izena\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - paketeak biltzen dituen fitxategien izen zerrenda\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - taldea\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - lizentzia\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - pakete izena\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - \"zaharkituak\" etiketak\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - paketatzailea\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - \"hornitu\" etiketak.\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - \"beharrezko\" etiketak\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - neurria instalatu ondoren\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - rpm iturburu izena.\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - bilatu «suggests» bezala markatutakoen artean\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - laburpena\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - hornitzailea\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - paketea zeukan euskarria\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f - bertsioa, argitalpena eta fitxategia ere izenarekin inprimatzen "
+"ditu.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "amaitugabeko adierazpena (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Formatu okerra: etiketa balio-anitz bakarra erabili dezakezu"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "ez dago \"%s\" euskarriarentzako hdlist eskuragarri"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "ez dago \"%s\" euskarriarentzako synthesis eskuragarri"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "ez dago \"%s\" euskarriarentzako xml-info eskuragarri"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2030,7 +2062,8 @@ msgstr "  --buildrequires - instalatu paketeen «buildrequires»\n"
 #: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
+msgstr ""
+"  --install-src  - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
 
 #: ../urpmi:99
 #, c-format
@@ -2044,7 +2077,8 @@ msgstr "  --noclean      - ez garbitu rpm-ak katxetik.\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 "  --replacepkgs  - behartu dagoeneko instalatuta dauden paketeen "
 "instalaketa.\n"
@@ -2178,7 +2212,8 @@ msgstr "  --excludedocs  - docs fitxategiak kanpoan uzten ditu.\n"
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - ez egiaztatu diskoan dagoen lekua instalazio aurretik.\n"
+msgstr ""
+"  --ignoresize   - ez egiaztatu diskoan dagoen lekua instalazio aurretik.\n"
 
 #: ../urpmi:139
 #, c-format
@@ -2222,7 +2257,8 @@ msgstr "  --nolock       - ez giltzatu rpm db.\n"
 #: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - berritu soilik arkitektura berdina duten paketeak.\n"
+msgstr ""
+"  --strict-arch  - berritu soilik arkitektura berdina duten paketeak.\n"
 
 #: ../urpmi:149 ../urpmq:97
 #, c-format
@@ -2242,7 +2278,8 @@ msgstr "  --debug        - oso modu berritsua.\n"
 #: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
+msgstr ""
+"  komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
 
 #: ../urpmi:183
 #, c-format
@@ -2276,8 +2313,10 @@ msgstr "lehenetsia --buildrequires"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "mesedez erabili --buildrequires edo --install-src, lehenetsia --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"mesedez erabili --buildrequires edo --install-src, lehenetsia --buildrequires"
 
 #: ../urpmi:253
 #, c-format
@@ -2302,48 +2341,43 @@ msgstr ""
 "Akatsa: %s irakurri-soilik muntatu dela dirudi.\n"
 "Erabili --allow-force eragiketa behartzeko."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Euskarria eguneratzen...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (eguneratu)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (eguneratu)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (instalatu)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (instalatu)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "%s mendekotasuna asetzeko, ondoko paketeetako bat behar da:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Zein hautatzen duzu? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2354,7 +2388,7 @@ msgstr ""
 " batzuekiko menpekotasuna dutelako:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2365,7 +2399,7 @@ msgstr ""
 " batzuekiko menpekotasuna dutelako:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2374,12 +2408,12 @@ msgstr ""
 "\n"
 "Instalazioarekin jarraitu hala ere?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (B/e) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2388,7 +2422,7 @@ msgstr ""
 "Eskatutako pakete bat ezin da instalatu:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2397,12 +2431,12 @@ msgstr ""
 "Eskatutako pakete bat ezin da instalatu:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s paketea kentzen baduzu, sistema apurtuko duzu"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2413,7 +2447,7 @@ msgstr ""
 "kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2424,12 +2458,12 @@ msgstr ""
 "kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(froga soilik, ezabaketa ez da egingo)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2440,46 +2474,46 @@ msgstr ""
 "mendekotasunak instalatzeko:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Ondoko pakete umezurtza ezabatuko da."
 msgstr[1] "Ondoko pakete umezurtzak ezabatuko dira."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(froga soilik, instalazioa ez da egingo)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "diskoan %s leku gehiago erabiliko da."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "diskoan %s lekua askatuko da."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "paketeen %s eskuratuko dira."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Pakete baten instalaketarekin arrera jarraitu nahi duzu?"
 msgstr[1] "%d paketeen instalaketarekin jarraitu nahi duzu?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Sakatu 'Sartu' muntatuta dagoenean..."
@@ -2531,7 +2565,8 @@ msgstr ""
 #: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
+msgstr ""
+"  --wget         - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
 #: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
@@ -2541,7 +2576,8 @@ msgstr "  --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 #: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
-msgstr "  --prozilla     - prozilla erabiltzen du urruneko fitxategiak eskuratzeko.\n"
+msgstr ""
+"  --prozilla     - prozilla erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
 #: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
@@ -2679,7 +2715,8 @@ msgstr "Ezin da konfig fitxategia sortu [%s]"
 #: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "ez dago <synthesis-en bide erlatiboa> eman beharrik --distrib aukerarekin"
+msgstr ""
+"ez dago <synthesis-en bide erlatiboa> eman beharrik --distrib aukerarekin"
 
 #: ../urpmi.addmedia:144
 #, c-format
@@ -2736,7 +2773,8 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - zerrendatu ematen den data/iraupen argumentutik egin "
 "diren eragiketak\n"
@@ -2917,7 +2955,8 @@ msgstr "  --no-ignore    - ez eguneratu, markatu euskarria gaitu gisa.\n"
 #: ../urpmi.update:49
 #, c-format
 msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
-msgstr "  --probe-rpms   - ez erabili synthesis, zuzenean rpm fitxategiak erabili\n"
+msgstr ""
+"  --probe-rpms   - ez erabili synthesis, zuzenean rpm fitxategiak erabili\n"
 
 #: ../urpmi.update:50
 #, c-format
@@ -2939,12 +2978,13 @@ msgstr "  -f             - benetan behartu synthesis eguneraketa.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Supererabiltzaileak soilik dauka euskarriak eguneratzeko baimena"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
+msgstr ""
+"ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2953,17 +2993,17 @@ msgstr ""
 "eguneratu beharreko sarrera falta da\n"
 "(%s(e)tako bat\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "%s euskarria baztertzen"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "%s euskarria gaitzen"
@@ -3035,17 +3075,21 @@ msgstr "  --list-aliases - alias paralelo erabilgarrien zerrenda.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - config urpmi.addmedia argumentu gisa iraultzen du.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - config urpmi.addmedia argumentu gisa iraultzen du.\n"
 
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
+msgstr ""
+"  --src          - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "--sources - iturburu-pakete guztiak deskargatu aurretik ematen ditu \n"
 " (root-ek bakarrik).\n"
@@ -3176,14 +3220,16 @@ msgstr ""
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
+msgstr ""
+"  -s             - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
 
 #: ../urpmq:106
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
-msgstr "-u               - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
+msgstr ""
+"-u               - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
 
 #: ../urpmq:107
 #, c-format
@@ -3200,7 +3246,8 @@ msgstr ""
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
+msgstr ""
+"  komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3233,14 +3280,16 @@ msgstr ""
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "ez dago \"%s\" euskarriarentzako xml info, ezin da %s paketearentzako "
 "inolako emaitzarik itzuli"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "ez dago \"%s\" euskarriarentzako xml info, ezin da %s paketeentzako inolako "
 "emaitzarik itzuli"
@@ -3250,3 +3299,5 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Ez da changelog  aurkitu\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Euskarria eguneratzen...\n"
diff --git a/po/fa.po b/po/fa.po
index bc44611e..d152cd4e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-02-06 08:42-0500\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -20,22 +20,22 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "نصب RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_تأیید"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "چکار می‌خواهید انجام دهید؟"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "ادامه میدهید؟"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -86,22 +86,22 @@ msgstr ""
 "\n"
 "ممکن ایت ترجیح دهید فقط آن را ذخیره کنید. امنخاب شما کدام است؟"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_نصب"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_ذخیره"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_لغو"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "مکان ذخیره‌ی پرونده را انتخاب کنید"
@@ -204,12 +204,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "هیچ بسته‌ای با نام %s"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "لطفاً صبر کنید..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "باید مدیر باشید"
@@ -240,42 +240,42 @@ msgstr ""
 "%s\n"
 "ادامه میدهید؟"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "تایید"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (ارتقاء دادن)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (نصب کردن)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_ترک"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -286,55 +286,62 @@ msgstr ""
 "%s\n"
 "ادامه میدهید؟"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(بسته‌های %d، %d مگابایت)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "در حال آماده کردن..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "نصب بسته `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "بارگیری بسته `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...دریافت شکست خورد: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_انجام شد"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -345,28 +352,27 @@ msgstr ""
 "%s\n"
 "بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "نصب شکست خورد"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "همه چیز قبلاً نصب شده است"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "نصب پایان یافت"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "برداشتن %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "راه‌اندازی دوباره‌ی urpmi"
@@ -440,58 +446,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "استفاده از محیط مشخص بر %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "نمی‌توان rpmdb را باز کرد"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "نام پرونده rpm نامعتبر [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "در حال دریافت پرونده‌ی rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...دریافت انجام گرفت"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...دریافت شکست خورد: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "نمی‌توان به پرونده rpm [%s] دسترسی یافت"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "نمی‌توان  \"%s\" را در پرونده [%s] تجزیه کرد"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "نمی‌توان پرونده rpm را بایگانی کرد"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "خطا در بایگانی کردن بسته‌های محلی"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -531,22 +531,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -638,82 +638,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "کپی کردن شکست خورد"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "بدلیل عدم وجود %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "بدلیل عدم وجود %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "بدلیل عدم وجود %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "برداشتن %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...دریافت شکست خورد: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "پایان‌نامه‌ی ناشناس برای %s تعیین شده است"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "هیچ webfetch یافت نشد، webfetch دارای پشتیبانی: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "نمی‌توان پایان‌نامه را اداره کرد: %s"
@@ -733,58 +738,58 @@ msgstr "بسته‌ی %s پیدا نشد."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "دریافت پرونده‌های rpm از رسانه \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "قطعات ایجاد شده برای نصب بر %s (remove=%d, install=%d, upgrade=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "نمی‌توان تکه‌های انتقالی را ایجاد کرد"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "نمی‌توان بسته‌ی %s را برداشت"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "نمی‌توان بسته %s را نصب کرد"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "نصب %s از %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...دریافت شکست خورد: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "برداشتن بسته %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "برداشتن بسته %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "نصب %s از %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "اطلاعات بیشتر برای بسته‌ی %s"
@@ -829,75 +834,80 @@ msgstr "هشدار"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "نصب شکست خورد"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "نصب %s از %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "انتشار دادن %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "نصب %s از %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "نصب %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "نصب ممکن می‌باشد"
@@ -1103,7 +1113,7 @@ msgstr "کپی از [%s] شکست خورد (پرونده بطرز مشکوکی �
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "حساب کردن md5sum از hdlist منبع دریافت شده (یا ترکیب)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "کپی کردن [%s] شکست خورد (عدم تطابق md5sum)"
@@ -1143,32 +1153,32 @@ msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "دریافت hdlist منبع (یا ترکیب) \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "در حال آزمایش پرونده کلید عمومی \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...در حال وارد کردن کلید %s از پرونده کلیدعمومی \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "نمی‌توان پرونده کلید عمومی \"%s\" را وارد کرد"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "رسانه اضافه شده %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1183,94 +1193,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "خواندن پرونده‌های rpm از [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "NnخنoO"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyبfF"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "متأسفم، انتخاب بد، دوباره امتحان کنید\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "جستجو"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "برداشتن رسانه‌ی \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1352,297 +1367,6 @@ msgstr "سوار کردن %s"
 msgid "unmounting %s"
 msgstr "پیاده کردن %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf version %s\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"این نرم‌افزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
-"\n"
-"طرز استفاده:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - چاپ این پیغام راهنما.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - استفاده از محیط مشخص (معمولاً یک گزارش اشکال).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - از رسانه‌ی داده نشده استفاده نشود، جدا شده توسط ویرگول.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - ترتیب دادن رسانه‌ها بر اساس زیررشته‌ها جدا شده با ویرگول.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - خطهای یکسان چاپ نشوند.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - فقط استفاده از رسانه‌های بروزسازی.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - حالت لغتی.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - ضمیمه مستقیم رمز پرل مانند perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr ""
-"  -a             - binary AND operator, true اگر هر دو عبارت درست باشند.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr ""
-"  -o             - binary OR operator, درست است اگر یک تعریف درست باشد.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -q             - حالت ساکت.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - پرانطز راست برای بستن عبارت گروه.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"لیست داده‌های برای ذخیره:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - استفاده از واسط X.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    %s پیش‌فرض است.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - چاپ برچسب url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - چاپ برچسب ساخت‌میزبان: ساختن میزبان.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "بخش تنظیم کنسول"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - چاپ برچسب اختلاف‌ها: همه اختلاف‌ها.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - چاپ برچسب epoch: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - چاپ برچسب گروه: گروه.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - برچسب چاپ عرضه می‌دارد: عرضه‌ی همه.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - چاپ برچسب لازمه: همه لازم.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - چاپ برچسب اندازه: اندازه.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - چاپ برچسب sourcerpm: منبع rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - برچسب خلاصه‌ی چاپ: خلاصه.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - چاپ برچسب url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - حالت لغتی.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - چاپ نسخه، انتشار و ساختار با نام.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "نگارش پرونده لیست برای رسانه \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1659,7 +1383,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "هیچ بسته‌ای با نام %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
@@ -1669,47 +1393,47 @@ msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "همه چیز قبلاً نصب شده است"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "همه چیز قبلاً نصب شده است"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "همه چیز قبلاً نصب شده است"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "بدلیل عدم وجود %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "همه چیز قبلاً نصب شده است"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "بدلیل عدم رضایت %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "تلاش برای ترفیع %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "برای نگهداشتن %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1718,7 +1442,7 @@ msgstr ""
 "بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1727,12 +1451,12 @@ msgstr ""
 "بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "برای نصب %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "بدلیل اختلاف با %s"
@@ -1824,6 +1548,12 @@ msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - استفاده از ریشه‌ی دیگری برای حذف نصب  rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1853,81 +1583,360 @@ msgstr "  --verbose, -v  - حالت لغتی.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - انتخاب تمام بسته‌های مطابق با عبارت.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "فقط کاربر مدیر برای برداشتن بسته‌ها مجاز است"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "بسته‌های ناشناس"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "بسته‌ی ناشناس"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "هیچ چیزی برای برداشتن"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "هیچ چیزی برای برداشتن"
 
-#: ../urpme:149
+#: ../urpme:151
 #, 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] "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "بسته‌ی ناشناس"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "برداشتن بسته %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "پذیرش دستگاه‌های قابل انتقال مانند \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "برداشتن شکست خورد"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "برداشتن شکست خورد"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf version %s\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"این نرم‌افزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
+"\n"
+"طرز استفاده:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - چاپ این پیغام راهنما.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - استفاده از محیط مشخص (معمولاً یک گزارش اشکال).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - از رسانه‌ی داده نشده استفاده نشود، جدا شده توسط ویرگول.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - ترتیب دادن رسانه‌ها بر اساس زیررشته‌ها جدا شده با ویرگول.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - خطهای یکسان چاپ نشوند.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - فقط استفاده از رسانه‌های بروزسازی.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - حالت لغتی.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - ضمیمه مستقیم رمز پرل مانند perl -e.\n"
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr ""
+"  -a             - binary AND operator, true اگر هر دو عبارت درست باشند.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr ""
+"  -o             - binary OR operator, درست است اگر یک تعریف درست باشد.\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -q             - حالت ساکت.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - پرانطز راست برای بستن عبارت گروه.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"لیست داده‌های برای ذخیره:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - استفاده از واسط X.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    %s پیش‌فرض است.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - چاپ برچسب url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - چاپ برچسب ساخت‌میزبان: ساختن میزبان.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "بخش تنظیم کنسول"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - چاپ برچسب اختلاف‌ها: همه اختلاف‌ها.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - چاپ برچسب epoch: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - چاپ برچسب گروه: گروه.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - برچسب چاپ عرضه می‌دارد: عرضه‌ی همه.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - چاپ برچسب لازمه: همه لازم.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - چاپ برچسب اندازه: اندازه.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - چاپ برچسب sourcerpm: منبع rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - برچسب خلاصه‌ی چاپ: خلاصه.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - چاپ برچسب url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - حالت لغتی.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - چاپ نسخه، انتشار و ساختار با نام.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "نگارش پرونده لیست برای رسانه \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2268,48 +2277,43 @@ msgstr ""
 "خطا: %s بنظر میرسد بطور فقط-خوانش سوار شده است.\n"
 "از --allow-force برای اجبار عملیات استفاده گردد."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (ارتقاء دادن)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (ارتقاء دادن)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (نصب کردن)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (نصب کردن)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "انتخاب شما چه است؟ (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2320,7 +2324,7 @@ msgstr ""
 "بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2331,19 +2335,19 @@ msgstr ""
 "بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "در هر حال ادامه می‌دهید؟"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2352,7 +2356,7 @@ msgstr ""
 "بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2361,12 +2365,12 @@ msgstr ""
 "بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2377,7 +2381,7 @@ msgstr ""
 "باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2388,12 +2392,12 @@ msgstr ""
 "باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2403,44 +2407,44 @@ msgstr ""
 "برای نصب وابستگی‌های بدنبال آمده شما باید مدیر سیستم باشید:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "وقتی آماده‌اید ورود را فشار دهید..."
@@ -2885,13 +2889,13 @@ msgstr "  -f             - اجبار تولید پرونده‌های hdlist.\n
 msgid "Only superuser is allowed to update media"
 msgstr "فقط کاربر مدیر برای بروزسازی رسانه مجاز است"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "هیچ چیز برای بروزسازی (استفاده از urpmi.addmedia برای اضافه کردن یک رسانه)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2900,17 +2904,17 @@ msgstr ""
 "ورودی برای بروزسازی وجود ندارد\n"
 "(یکی از %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "نادیده‌گیری رسانه‌ی %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "بکار انداختن رسانه‌ی %s"
diff --git a/po/fi.po b/po/fi.po
index 0108971a..37ef753b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-03-28 11:58+0200\n"
 "Last-Translator: Anssi Hannula <anssi@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -24,22 +24,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM:n asentaminen"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Virhe: tiedostoa %s ei löydy, peruutetaan toimenpide"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -60,7 +60,7 @@ msgstr ""
 "\n"
 "Mitä haluat tehdä?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -75,7 +75,7 @@ msgstr ""
 "\n"
 "Jatketaanko?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -90,22 +90,22 @@ msgstr ""
 "\n"
 "Halutessasi voit myös vain tallentaa sen. Mitä haluat tehdä?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Asenna"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Peruuta"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Valitse hakemisto johon tiedosto tallennetaan"
@@ -210,12 +210,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Paketteja ei annettu"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Odota hetki..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Pitää olla pääkäyttäjä"
@@ -246,42 +246,42 @@ msgstr ""
 "%s\n"
 "Jatketaanko muiden pakettien asentamista?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (päivitettävä)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (asennettava)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Pakettivalinta"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Yksi seuraavista paketeista tarvitaan:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Hylkää"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -292,56 +292,63 @@ msgstr ""
 "%s\n"
 "Jatketaanko silti?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paketti, %d Mt)"
 msgstr[1] "(%d pakettia, %d Mt)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistellaan..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Asennetaan pakettia `%s' (%s / %s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Aseta sisään media \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Ladataan pakettia `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...nouto epäonnistui: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Valmis"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -352,28 +359,27 @@ msgstr ""
 "%s\n"
 "Sinun kannattaisi päivittää urpmi-tietokanta"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Asennus epäonnistui:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Kaikki on jo asennettu"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Asennus on valmis"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "poistetaan %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "uudelleenkäynnistetään urpmi"
@@ -447,58 +453,52 @@ msgstr "Ympäristökansio %s ei ole olemassa"
 msgid "using specific environment on %s\n"
 msgstr "käytetään määrättyä ympäristöä kohteelle %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpm-tietokantaa ei voitu avata"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "virheellinen rpm-tiedoston nimi [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "noudetaan rpm-tiedostoa [%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...noudettu"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...nouto epäonnistui: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm-tiedostoa [%s] ei voitu käsitellä"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ei voitu tulkita spec-tiedostoa %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm-tiedoston rekisteröinti ei onnistunut"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Paketin laitteistoarkkitehtuuri ei ole yhteensopiva [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "virhe rekisteröitäessä paikallisia paketteja"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Tämä toiminto on kielletty kon ohjelma käytetään rajoitetussa tilassa"
@@ -540,22 +540,22 @@ msgstr ""
 "urpmf odottaa oletuksena säännöllistä lauseketta. Käytä valitsinta \"--"
 "literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kansio ei ole olemassa"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s ei voida käyttää ilman %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s ei voida käyttää %s kanssa"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Liian monta argumenttia\n"
@@ -649,82 +649,87 @@ msgstr "%s epäonnistui: lopetti signaalilla %d"
 msgid "%s failed: exited with %d"
 msgstr "%s epäonnistui: lopetti arvolla %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "kopiointi epäonnistui"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget puuttuu\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl puuttuu\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl epäonnistui: lataaminen peruutettu\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync puuttuu\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh puuttuu\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla puuttuu\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Ohjelmaa prozilla ei voitu suorittaa\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 puuttuu\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% valmis, koko %s, valmistumisaika %s, nopeus %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% valmis, nopeus %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "noudetaan %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "noudettiin %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "tuntematon protokolla määrätty kohteelle %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "yhtään webfetch-ohjelmaa ei löytynyt, tuetut ovat: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ei voida käsitellä protokollaa: %s"
@@ -744,58 +749,58 @@ msgstr "pakettia %s ei löytynyt."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "noudetaan rpm-tiedostoja medialta \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[uudelleenpaketoidaan]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "luotiin tapahtuma asennukselle %s (poisto=%d, asennus=%d, päivitys=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "tapahtumaa ei voitu luoda"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "paketin purkaminen %s delta-rpm paketista ei onnistu"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "pakettia %s ei voitu asentaa"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "poistetaan viallinen rpm (%s) kansiosta %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "tiedoston %s poisto epäonnistui: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Poistetaan paketti %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "poistetaan paketti %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "poistetaan asennetut paketit (%s) kansiosta %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Lisätietoja paketista %s"
@@ -840,18 +845,23 @@ msgstr "keskeytetään"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s-tietokanta on lukittu (se on toisen ohjelman käytössä)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -860,57 +870,57 @@ msgstr ""
 "Asennus epäonnistui, viallisia tiedostoja:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Seuraavalla paketilla on virheellinen allekirjoitus"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Seuraavilla paketeilla on virheellinen allekirjoitus"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Haluatko jatkaa asennusta?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "poistetaan asennetut paketit (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "levitetään %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "asennetaan %s kohteesta %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "asennetaan %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Yritetäänkö asentaa ilman riippuvuuksia? (k/E) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Yritetäänkö asentaa pakolla (--force)? (k/E) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketit ovat ajan tasalla"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Asennus on mahdollinen"
@@ -1115,7 +1125,7 @@ msgstr "[%s] kopiointi epäonnistui (tiedosto on epäilyttävän pieni)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "lasketaan md5sum haetulle lähde-synthesis-tiedostolle"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "tiedoston [%s] haku epäonnistui (md5sum ei täsmää)"
@@ -1155,32 +1165,32 @@ msgstr "synthesis-tiedostoa ei löytynyt medialle \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "noudetaan synthesis lähteelle \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "tarkistetaan median \"%s\" pubkey-tiedostoa..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...tuotu avain %s median \"%s\" pubkey-tiedostosta"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "median \"%s\" pubkey-tiedostoa ei voitu tuoda"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "synthesis-tiedostoa ei löytynyt medialle \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "media \"%s\" päivitetty"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] hakeminen epäonnistui"
@@ -1195,94 +1205,99 @@ msgstr "yritetään uudelleen peilipalvelimella %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Peilipalvelinta ei löydetty listalta %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "pääteltiin sijainti %s %.2f %.2f aikavyöhykkeestä %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "haetaan peilipalvelinluetteloa kohteesta %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "EeNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "KkYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (k/E) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Paketti"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versio"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Julkaisu"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arkkitehtuuri"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(ehdotettu)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "media \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "komentorivi"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "t"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "kt"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "Mt"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "Gt"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "Tt"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1365,307 +1380,6 @@ msgstr "liitetään %s"
 msgid "unmounting %s"
 msgstr "irrotetaan %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Tämä on vapaa ohjelmisto, jota saa levittää GNU GPL -lisenssin mukaisesti.\n"
-"\n"
-"käyttö: urpmf [valitsimet] hakulauseke\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - tulosta tämän työkalun versionumero.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - käytä määrättyä ympäristöä (yleensä virheraportti)\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - älä käytä seuraavia pilkuilla erotettuja medioita\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - käytä argumenttia pelkkänä hakusanana säännöllisen\n"
-"                   lausekkeen sijasta\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - käytä määriteltyä juurta urpmin tietokannalle ja\n"
-"                   rpm-pakettien asentamiseen.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - lajittele mediat pilkuilla erotettujen alimerkkijonojen "
-"mukaan\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - käytä annettua polkua jakelun hakuun\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - käytä annettua synthesis-tiedostoa urpmi-tietokannan "
-"sijasta\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - älä tulosta identtisiä rivejä\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - käytä ainoastaan päivitysmediaa\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - yksityiskohtainen tyyli\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - älä erottele isoja ja pieniä kirjaimia hakuehdoissa\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - erottele isot ja pienet kirjaimet hakuehdoissa\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<erotin>     - vaihda kenttäerotinta (oletus \":\").\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Hakulausekkeet:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  teksti         - kaikki teksti jäsennetään säännöllisenä lausekkeena,\n"
-"                   ellei parametria -l käytetä.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - sisällytä perl-koodia suoraan 'perl -e'\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binaarinen JA-operaattori.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binaarinen TAI-operaattori.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unaarinen EI-operaattori.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - sulkumerkit lausekeryhmän sulkemiseen\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Haettavat tiedot:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - aseta printf-tyylinen tulostusmuoto\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   esimerkki: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - laitteistoarkkitehtuuri\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - paketoimiskone\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - paketoimisaika\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - asetustiedostot\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - konfliktimerkinnät\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - paketin kuvaus\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - jakelu\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - aikakausi\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - paketin tiedostonimi\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - listaa paketissa olevat tiedostot\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - ryhmä\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - lisenssi\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - paketin nimi\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - vanhennusmerkinnät\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - paketoija\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - tarjoamismerkinnät\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - riippuvuusmerkinnät\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - koko asennettuna\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - lähde-rpm-tiedoston nimi\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - ehdotusmerkinnät\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - yhteenveto\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - toimittaja\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - paketin media\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - tulosta versio, julkaisu ja arkkitehtuuri nimen lisäksi\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-"Virheellinen muoto: vain yhtä moniarvoista merkintää voi käyttää kerrallaan"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "medialla \"%s\" ei ole hdlist-tiedostoa "
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "medialla \"%s\" ei ole synthesis-tiedostoa "
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "medialla \"%s\" ei ole xml-info -tietoja"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1685,7 +1399,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Ei pakettia nimeltä %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Seuraavat paketit sisältävät %s: %s"
@@ -1695,47 +1409,47 @@ msgstr "Seuraavat paketit sisältävät %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Paketteja %s ei voida asentaa"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Paketti %s on jo asennettu"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketit %s on jo asennettu"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "puuttuvan %s takia"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "jo asennetun %s vuoksi"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "täyttämättömän %s takia"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "yritetään pakottaa %s valinta"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s säilyttämiseksi"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1744,7 +1458,7 @@ msgstr ""
 "Seuraava paketti on poistettava, jotta toiset voidaan päivittää:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1753,12 +1467,12 @@ msgstr ""
 "Seuraavat paketit on poistettava, jotta toiset voidaan päivittää:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s asentamiseksi"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "johtuen ristiriidasta %s kanssa"
@@ -1849,6 +1563,14 @@ msgstr "  --repackage    - Paketoi tiedostot uudelleen ennen poistoa\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - käytä määriteltyä juurta rpm-poistolle\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - käytä määriteltyä juurta urpmin tietokannalle ja\n"
+"                   rpm-pakettien asentamiseen.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1880,39 +1602,39 @@ msgstr "  --verbose, -v  - yksityiskohtainen tyyli\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - valitse kaikki lausekkeeseen täsmäävät\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Vain pääkäyttäjä saa poistaa paketteja"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "tuntemattomia paketteja"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "tuntematon paketti"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "paketin %s poisto rikkoisi järjestelmäsi"
 msgstr[1] "paketin %s poisto rikkoisi järjestelmäsi"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ei mitään poistettavissa"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Ei mitään poistettavissa"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1920,45 +1642,332 @@ msgid_plural ""
 msgstr[0] "Riippuvuuksien täyttämiseksi seuraava paketti poistetaan"
 msgstr[1] "Riippuvuuksien täyttämiseksi seuraavat %d pakettia poistetaan"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "tuntematon paketti"
 msgstr[1] "tuntematon paketti"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Poista %d paketti?"
 msgstr[1] "Poista %d pakettia?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (k/E) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Poisto epäonnistui"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Poisto epäonnistui"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Tämä on vapaa ohjelmisto, jota saa levittää GNU GPL -lisenssin mukaisesti.\n"
+"\n"
+"käyttö: urpmf [valitsimet] hakulauseke\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - tulosta tämän työkalun versionumero.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - käytä määrättyä ympäristöä (yleensä virheraportti)\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - älä käytä seuraavia pilkuilla erotettuja medioita\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - käytä argumenttia pelkkänä hakusanana säännöllisen\n"
+"                   lausekkeen sijasta\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - lajittele mediat pilkuilla erotettujen alimerkkijonojen "
+"mukaan\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - käytä annettua polkua jakelun hakuun\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - käytä annettua synthesis-tiedostoa urpmi-tietokannan "
+"sijasta\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - älä tulosta identtisiä rivejä\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - käytä ainoastaan päivitysmediaa\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - yksityiskohtainen tyyli\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - älä erottele isoja ja pieniä kirjaimia hakuehdoissa\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - erottele isot ja pienet kirjaimet hakuehdoissa\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<erotin>     - vaihda kenttäerotinta (oletus \":\").\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Hakulausekkeet:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  teksti         - kaikki teksti jäsennetään säännöllisenä lausekkeena,\n"
+"                   ellei parametria -l käytetä.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - sisällytä perl-koodia suoraan 'perl -e'\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binaarinen JA-operaattori.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binaarinen TAI-operaattori.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unaarinen EI-operaattori.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - sulkumerkit lausekeryhmän sulkemiseen\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Haettavat tiedot:\n"
+"\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - aseta printf-tyylinen tulostusmuoto\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   esimerkki: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - laitteistoarkkitehtuuri\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - paketoimiskone\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - paketoimisaika\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - asetustiedostot\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - konfliktimerkinnät\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - paketin kuvaus\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - jakelu\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - aikakausi\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - paketin tiedostonimi\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - listaa paketissa olevat tiedostot\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - ryhmä\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - lisenssi\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - paketin nimi\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - vanhennusmerkinnät\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - paketoija\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - tarjoamismerkinnät\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - riippuvuusmerkinnät\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - koko asennettuna\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - lähde-rpm-tiedoston nimi\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - ehdotusmerkinnät\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - yhteenveto\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - URL\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - toimittaja\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - paketin media\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - tulosta versio, julkaisu ja arkkitehtuuri nimen lisäksi\n"
+
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Hakulausekkeet:\n"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Virheellinen muoto: vain yhtä moniarvoista merkintää voi käyttää kerrallaan"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "medialla \"%s\" ei ole hdlist-tiedostoa "
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "medialla \"%s\" ei ole synthesis-tiedostoa "
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "medialla \"%s\" ei ole xml-info -tietoja"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2314,36 +2323,31 @@ msgstr ""
 "Virhe: %s näyttää olevean liitettynä ainoastan lukuoikeuksilla.\n"
 "Käytä --allow-force pakottaaksesi toiminnon."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Päivitetään mediaa...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (päivitettävä)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (päivitettävä)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (asennettava)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (asennettava)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2351,12 +2355,12 @@ msgid ""
 msgstr ""
 "Riippuvuuden '%s' täyttämiseksi jokin seuraavista paketeista on asennettava:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Mikä on valintasi? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2367,7 +2371,7 @@ msgstr ""
 "jotka ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2378,7 +2382,7 @@ msgstr ""
 "jotka ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2387,12 +2391,12 @@ msgstr ""
 "\n"
 "Jatka muiden pakettien asennusta?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (K/e) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2401,7 +2405,7 @@ msgstr ""
 "Haluttua pakettia ei voida asentaa:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2410,12 +2414,12 @@ msgstr ""
 "Joitakin haluttuja paketteja ei voida asentaa:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketin %s poisto rikkoisi järjestelmäsi"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2426,7 +2430,7 @@ msgstr ""
 "jotta toiset voidaan päivittää:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2437,12 +2441,12 @@ msgstr ""
 "jotta toiset voidaan päivittää:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(vain koe, paketteja ei oikeasti poisteta)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2453,46 +2457,46 @@ msgstr ""
 "asentaaksesi seuraavat riippuvuudet:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Riippuvuuksien täyttämiseksi seuraava paketti poistetaan"
 msgstr[1] "Riippuvuuksien täyttämiseksi seuraavat %d pakettia poistetaan"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(vain koe, paketteja ei oikeasti asenneta)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Pakettien asentaminen vie %s lisää levytilaa."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s levytilaa vapautuu."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Noudetaan yhteensä %s."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Asennetaanko tämä paketti?"
 msgstr[1] "Asennetaanko nämä %d pakettia?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Paina Enter liittämisen jälkeen..."
@@ -2948,12 +2952,12 @@ msgstr "  -ff            - pakota enemmän\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Vain pääkäyttäjä saa päivittää mediat"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätäksesi median)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2962,17 +2966,17 @@ msgstr ""
 "Päivitettävä kohta puuttuu\n"
 "(jokin seuraavista: %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "Hylätään media %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "otetaan käyttöön media %s"
@@ -3252,6 +3256,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Muutoslokia ei löytynyt\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Päivitetään mediaa...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "tutkitaan %s-tiedostoa"
 
diff --git a/po/fr.po b/po/fr.po
index fd7d8492..db9590e7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-07 19:17+0200\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -34,22 +34,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2;plural=(n>1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Installation du RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erreur : fichier %s introuvable, annulation de l'opération"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "Que voulez-vous faire ?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -87,7 +87,7 @@ msgstr ""
 "\n"
 "Continuer ?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -103,22 +103,22 @@ msgstr ""
 "\n"
 "Peut-être préférez-vous simplement l'enregistrer. Quel est votre choix ?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Installer"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Sauver"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Choisissez un emplacement pour enregistrer le fichier."
@@ -235,12 +235,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Pas de paquetage spécifié"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Veuillez patienter ..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Vous devez être administrateur"
@@ -271,42 +271,42 @@ msgstr ""
 "%s\n"
 "Continuer quand même l'installation ?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Attention"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (à mettre à jour)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (à installer)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Choix d'un paquetage"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Un des paquetages suivants est nécessaire :"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Abandonner"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -318,58 +318,65 @@ msgstr ""
 "%s\n"
 "Continuer quand même l'installation ?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Pour satisfaire les dépendances, le paquetage suivant va être installé :"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Pour satisfaire les dépendances, les paquetages suivants vont être installés"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paquetage, %d Mo)"
 msgstr[1] "(%d paquetages, %d Mo)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "impossible de récupérer les paquetages de sources, abandon"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Préparation ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installation du paquetage « %s » (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Veuillez insérer le média nommé « %s »"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Téléchargement du paquetage %s ..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... échec de la récupération : %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Fini"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -380,28 +387,27 @@ msgstr ""
 "%s\n"
 "Vous devriez mettre à jour votre base de données urpmi."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "L'installation a échoué :"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Tous les paquetages sont déjà installés"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "L'installation est terminée"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "désinstallation de %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "Redémarrage de urpmi"
@@ -477,58 +483,52 @@ msgstr "Le répertoire d'environnement %s n'existe pas"
 msgid "using specific environment on %s\n"
 msgstr "avec environnement spécifique sur %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "impossible d'ouvrir la base de donnée rpm"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "le nom du fichier rpm est invalide [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "récupération des fichiers rpm [%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "... récupération effectuée"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... échec de la récupération : %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "impossible d'accéder au fichier rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "impossible d'analyser le fichier spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "impossible de référencer le fichier rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Architecture incompatible pour le paquetage [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "erreur lors de l'inscription des paquetages locaux"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Cette opération est interdite en mode restreint"
@@ -568,22 +568,22 @@ msgstr "pas d'expression à fermer"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "par défaut urpmf s'attend à une regexp, utilisez l'option « --literal »"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "le répertoire chroot n'existe pas"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Impossible d'utiliser %s sans %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Impossible d'utiliser %s avec %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Trop d'arguments\n"
@@ -677,82 +677,87 @@ msgstr "%s a échoué : sortie sur signal %d"
 msgid "%s failed: exited with %d"
 msgstr "%s a échoué : sortie avec %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "la copie a échoué"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget est manquant\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl est manquant\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "échec de curl : téléchargement annulé\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync est manquant\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh est manquant\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla est manquant\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Exécution de prozilla impossible\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 est manquant\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% de %s terminé, ETA = %s, débit = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% terminé, débit = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "récupération de %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "%s récupéré"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocole inconnu défini pour %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "aucun programme de téléchargement trouvé, ceux supportés sont : %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "impossible d'utiliser le protocole : %s"
@@ -772,12 +777,12 @@ msgstr "paquetage %s non trouvé."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "récupération des fichiers rpm à partir de « %s »..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[regénération]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -785,47 +790,47 @@ msgstr ""
 "transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade="
 "%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "impossible de créer la transaction"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "impossible d'extraire le rpm du paquetage delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "impossible d'installer le paquetage %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "suppression des paquetages bogués (%s) de %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "la suppression de %s a échouée : %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Désinstallation du paquetage %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "désinstallation du paquetage %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "suppression des paquetages installés (%s) de %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Plus d'information sur le paquetage %s"
@@ -870,18 +875,23 @@ msgstr "abandon"
 msgid "%s database is locked (another program is already using it)"
 msgstr "la base de donnée %s est verrouillée (un autre programme l'utilise)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "L'installation a échoué"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Essayer de continuer néanmoins ? (o/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -890,57 +900,57 @@ msgstr ""
 "L'installation a échoué à cause de paquets bogués :\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Le paquetage suivant a une signature invalide"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Les paquetages suivants ont des signatures non valides"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Voulez-vous continuer l'installation ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "suppression des paquetages installés (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribution de %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "installation de %s depuis %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "installation de %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Les paquetages sont à jour"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "L'installation est possible"
@@ -1146,7 +1156,7 @@ msgstr "La copie de [%s] a échoué (le fichier est étrangement petit)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "calcul de la somme de contrôle MD5 du fichier synthesis"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "échec de la récupération de [%s] (inégalité md5sum)"
@@ -1186,32 +1196,32 @@ msgstr "pas de métadonnées trouvées pour le média « %s »"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "récupération du fichier synthesis de « %s »..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examen du fichier de la clé publique de « %s »..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... clé %s importée à partir du fichier de la clé publique de « %s »"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "impossible d'importer le fichier de la clé publique de « %s »"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "pas de fichier synthesis trouvé pour le média « %s »"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "média « %s » mis à jour"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "échec de la récupération de [%s]"
@@ -1226,94 +1236,99 @@ msgstr "nouvel essai avec le miroir %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Impossible de trouver un mirror depuis la liste de mirroirs %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "géolocalisation trouvée %s %.2f %.2f du fuseau horaire %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "récupération de la liste des miroirs depuis %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "OoYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (o/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Désolé, mauvais choix, veuillez réessayer\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Paquetage"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Version"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Révision"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arch"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(conseillé)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "média « %s »"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "ligne de commande"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "o"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "Ko"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "Mo"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "Go"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "To"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1402,312 +1417,6 @@ msgstr "montage de %s"
 msgid "unmounting %s"
 msgstr "démontage de %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf version %s\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
-"licence GNU GPL.\n"
-"\n"
-"usage : urpmf [options] expression\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - afficher la version de cet utilitaire\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - utiliser un environment spécifique (en général\n"
-"                   un rapport d'anomalie).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - ne pas utiliser les médias spécifiés (séparés\n"
-"                   par des virgules).\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - ne remplace pas les jokers, applique l'argument tel "
-"quel.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - utiliser un autre répertoire racine pour l'installation "
-"et la base de donnée urpmi.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - trier les médias selon des sous-chaînes (séparées\n"
-"                   par des virgules).\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - utiliser le chemin spécifié pour accéder au média\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
-"                   de données urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ne pas afficher les lignes identiques.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - n'utiliser que les médias de mise à jour.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - mode verbeux.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignorer la distinction majuscules/minuscules.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - respecter la distinction majuscules/minuscules.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-"  -F<str>        - remplacer le séparateur par <str> (par défaut ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Motifs de substitution :\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  texte          - texte traité en expression régulière, sauf si option -l.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inclure du code perl directement.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - opérateur binaire ET.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - opérateur binaire OU.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NON unaire.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - parenthèses droite et gauche.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Liste des champs de recherche :\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - spécifie un format d'affichage de type printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   exemple : '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - chercher dans le champ architecture\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - chercher dans le champ « BuildHost »\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - chercher dans le champ « BuildTime »\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr ""
-"  --conffiles    - chercher dans la liste des fichiers de configuration\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - chercher dans le champ « conflicts »\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - chercher dans les descriptions de paquetages\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - chercher dans le champ « distribution »\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - chercher dans le champ « epoch »\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - chercher dans le nom de fichier du paquetage\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr ""
-"  --files        - chercher dans la liste des fichiers d'un paquetage\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - chercher dans le champ « Group »\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licence\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - chercher dans le nom du paquetage\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - chercher dans le champ « obsoletes »\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - chercher dans le nom du créateur du paquetage\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - chercher dans le champ « provides »\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - chercher dans la liste des dépendances\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - chercher dans le champ taille après installation\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - chercher dans le nom du paquetage source\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - chercher dans le champ «suggests»\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - chercher dans le résumé\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - chercher dans le champ « Url »\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - chercher dans le nom du fournisseur\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr ""
-"  -m             - chercher dans le média où le paquetage a été trouvé\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - afficher la version, la release et l'architecture\n"
-"                   du paquetage avec le nom.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-"Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "pas de fichier hdlist disponible pour le média « %s »"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "pas de fichier synthesis disponible pour le média « %s »"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "pas de fichier xml-info disponible pour le média « %s »"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1727,7 +1436,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Pas de paquetage nommé %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Les paquetages suivants contiennent %s : %s"
@@ -1737,47 +1446,47 @@ msgstr "Les paquetages suivants contiennent %s : %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Vous pouvez utiliser « -a » pour les sélectionner tous"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "paquetage(s) %s dans la base urpmi mais aucun n'est installé"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Le paquetage %s est déjà installé"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Les paquetages %s sont déjà installés"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "en raison du manque de %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "car le paquetage %s est déjà installé"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "car %s est non satisfait"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "Tentative de promouvoir %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "afin de garder %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1787,7 +1496,7 @@ msgstr ""
 "désinstallé :\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1797,12 +1506,12 @@ msgstr ""
 "désinstallés :\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "pour installer le paquetage %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "en raison de conflit avec %s"
@@ -1901,6 +1610,14 @@ msgstr ""
 "  --root         - utiliser un autre répertoire racine pour la "
 "désinstallation.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - utiliser un autre répertoire racine pour l'installation "
+"et la base de donnée urpmi.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1935,22 +1652,22 @@ msgstr ""
 "  -a             - sélectionner tous les paquetages correspondants à\n"
 "                   l'expression.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Seul l'administrateur système (root) peut supprimer des paquetages"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "paquetages inconnus"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "paquetage inconnu"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1959,17 +1676,17 @@ msgstr[0] ""
 msgstr[1] ""
 "La désinstallation des paquetages suivants rendra votre système instable"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Rien à désinstaller"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Aucun orphelin à supprimer"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1980,45 +1697,337 @@ msgstr[1] ""
 "Pour satisfaire les dépendances, les %d paquetages suivants vont être "
 "désinstallés"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(paquetage orphelin)"
 msgstr[1] "(paquetages orphelins)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Supprimer %d paquetage ?"
 msgstr[1] "Supprimer %d paquetages ?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (o/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "test de suppression de %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Échec de la désinstallation"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "La suppression est possible"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf version %s\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
+"licence GNU GPL.\n"
+"\n"
+"usage : urpmf [options] expression\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - afficher la version de cet utilitaire\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - utiliser un environment spécifique (en général\n"
+"                   un rapport d'anomalie).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - ne pas utiliser les médias spécifiés (séparés\n"
+"                   par des virgules).\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - ne remplace pas les jokers, applique l'argument tel "
+"quel.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - trier les médias selon des sous-chaînes (séparées\n"
+"                   par des virgules).\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - utiliser le chemin spécifié pour accéder au média\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
+"                   de données urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ne pas afficher les lignes identiques.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - n'utiliser que les médias de mise à jour.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - mode verbeux.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignorer la distinction majuscules/minuscules.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - respecter la distinction majuscules/minuscules.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+"  -F<str>        - remplacer le séparateur par <str> (par défaut ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Motifs de substitution :\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  texte          - texte traité en expression régulière, sauf si option -l.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inclure du code perl directement.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - opérateur binaire ET.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - opérateur binaire OU.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NON unaire.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - parenthèses droite et gauche.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Liste des champs de recherche :\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - spécifie un format d'affichage de type printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   exemple : '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - chercher dans le champ architecture\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - chercher dans le champ « BuildHost »\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - chercher dans le champ « BuildTime »\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr ""
+"  --conffiles    - chercher dans la liste des fichiers de configuration\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - chercher dans le champ « conflicts »\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - chercher dans les descriptions de paquetages\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - chercher dans le champ « distribution »\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - chercher dans le champ « epoch »\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - chercher dans le nom de fichier du paquetage\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr ""
+"  --files        - chercher dans la liste des fichiers d'un paquetage\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - chercher dans le champ « Group »\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licence\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - chercher dans le nom du paquetage\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - chercher dans le champ « obsoletes »\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - chercher dans le nom du créateur du paquetage\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - chercher dans le champ « provides »\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - chercher dans la liste des dépendances\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - chercher dans le champ taille après installation\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - chercher dans le nom du paquetage source\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - chercher dans le champ «suggests»\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - chercher dans le résumé\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - chercher dans le champ « Url »\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - chercher dans le nom du fournisseur\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr ""
+"  -m             - chercher dans le média où le paquetage a été trouvé\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - afficher la version, la release et l'architecture\n"
+"                   du paquetage avec le nom.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "expression non terminée (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "pas de fichier hdlist disponible pour le média « %s »"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "pas de fichier synthesis disponible pour le média « %s »"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "pas de fichier xml-info disponible pour le média « %s »"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2393,36 +2402,31 @@ msgstr ""
 "Erreur : %s semble être monté en lecture seule.\n"
 "Utilisez --allow-force afin de forcer l'opération."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Mise à jour des médias...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s : %s (à mettre à jour)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (à mettre à jour)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s : %s (à installer)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (à installer)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2431,12 +2435,12 @@ msgstr ""
 "Afin de satisfaire les dépendances de « %s », un des paquetages suivants est "
 "nécessaire :"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Que choisissez-vous ? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2447,7 +2451,7 @@ msgstr ""
 "de paquetage qui sont plus anciens que la version installée :\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2458,7 +2462,7 @@ msgstr ""
 "de paquetages qui sont plus anciens que les versions installées :\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2467,12 +2471,12 @@ msgstr ""
 "\n"
 "Désirez-vous tout de même continuer ?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (O/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2481,7 +2485,7 @@ msgstr ""
 "Le paquetage demandé ne peut pas être installé :\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2490,12 +2494,12 @@ msgstr ""
 "Certains paquetages demandés ne peuvent pas être installés :\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "La désinstallation du paquetage %s rendra votre système instable"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2506,7 +2510,7 @@ msgstr ""
 "doit être désinstallé :\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2517,12 +2521,12 @@ msgstr ""
 "doivent être désinstallés :\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(test uniquement, la suppression ne sera pas effectuée)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2533,46 +2537,46 @@ msgstr ""
 "dépendances suivantes :\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Le paquetage orphelin suivant va être désinstallé."
 msgstr[1] "Les paquetages orphelins suivants vont être désinstallés."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(test uniquement, l'installation ne sera pas effectuée)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "un espace additionnel de %s sera utilisé."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "un espace de %s sera libéré."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s de paquets seront récupérés."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Procéder à l'installation d'un paquetage ?"
 msgstr[1] "Procéder à l'installation des %d paquetages ?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Veuillez sur appuyez sur « Entrée » une fois le média monté ..."
@@ -3049,12 +3053,12 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Seul l'administrateur système (root) peut mettre à jour un média"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "rien à mettre à jour (utiliser urpmi.addmedia pour ajouter un média)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3063,17 +3067,17 @@ msgstr ""
 "l'entrée à mettre à jour est manquante\n"
 "(un parmi %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "« %s »"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "média %s ignoré"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "activation du média %s"
@@ -3372,6 +3376,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Aucun Changelog trouvé\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Mise à jour des médias...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "examen du fichier [%s]"
 
diff --git a/po/fur.po b/po/fur.po
index 0cc0be30..d95c99f3 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fur\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2004-05-21 14:55+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: Furlan <gft@freelists.org>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Instalazion dal pachet..."
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, fuzzy, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -55,7 +55,7 @@ msgstr ""
 "\n"
 "Ce vuelistu fa?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "Tu podaressis preferî di salvâlu. Cuale ise le to sielte?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -85,22 +85,22 @@ msgstr ""
 "\n"
 "Tu podaressis preferî di salvâlu. Cuale ise le to sielte?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, fuzzy, c-format
 msgid "_Install"
 msgstr "Instale"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, fuzzy, c-format
 msgid "_Save"
 msgstr "Salve"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Scancele"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Sielç un puest dulà salvâ il file"
@@ -206,12 +206,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Nissun comant specificât"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, fuzzy, c-format
 msgid "Please wait..."
 msgstr "Par plasè spiete."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr ""
@@ -241,42 +241,42 @@ msgstr ""
 "Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
 "%s"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Avertence"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Instalazion Automatiche"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Al covente un di chiscj pachets:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Informazions"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -286,58 +286,65 @@ msgstr ""
 "I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
 "%s"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no rivi a recuperâ i pachets sorzint, o fermi"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "In preparazion..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalazion dal pachet `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "O stoi scjariant il pachet '%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...copie falade: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Fat"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -348,28 +355,27 @@ msgstr ""
 "%s\n"
 "Tu podaressis ve voe di atualizâ il to database urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalazion falade"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Al è dut dizà instalât"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalazion finide"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "rimozion di %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "rinviament di urpmi"
@@ -444,58 +450,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "o dopri les variabilis di ambient su %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "no rivi a vierzi il database rpm"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "non dal file rpm no valevul [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "o recuperi il file rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...copie finide"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...copie falade: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no rivi a acedi al file rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "no rivi a analizâ \"%s\" tal file [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "no rivi a regjstrâ il file rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "fal te regjistrazion dai pachets locâi"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -535,22 +535,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -642,82 +642,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Copie falade"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "cause cal mancje %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "cause cal mancje %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "cause cal mancje %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "rimozion di %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...copie falade: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol no cognosût definît par %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nissun webfetch cjatât, chei sopuartâts e son: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "no rivi a gjestî il protocol: %s"
@@ -737,12 +742,12 @@ msgstr "il pachet %s no l'è stât cjatât."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "o recuperi il file rpm de font \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -750,47 +755,47 @@ msgstr ""
 "e je stade creade le transazion par instalâ su %s (rimôf=%d, instale=%d, "
 "atualize=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "no rivi a creâ le transazion"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "no rivi a rimovi il pachet %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "no rivi a instalâ il pachet %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "instalazion di %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...copie falade: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "rimozion dal pachet %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "rimozion dal pachet %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "instalazion di %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Plui informazions sul pachet..."
@@ -835,77 +840,82 @@ msgstr "Avertence"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalazion falade"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Instalazion falade"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Chiscj pachets e an firmis no valevulis"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Chiscj pachets e an firmis no valevulis"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Âstu voie di continuâ le instalazion?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "instalazion di %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuzion di %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "instalazion di %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instalazion di %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Provjo a instalâ cence controlâ les dipendencis? (s/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr ""
 "Ajo di provâ le instalazion in maniere ancjimò plui sfuarçâde (--force)? (s/"
 "N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Le instalazion e je pussibil"
@@ -1111,7 +1121,7 @@ msgstr "copie di [%s] falade (il file al è piçul in maniere suspiete)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "o calcoli md5sum dal file hdlist (o synthesis) scjariât"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "copie di [%s] falade (md5sum no valevul)"
@@ -1151,32 +1161,32 @@ msgstr "nissun file hdlist cjatât pe font \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "o recuperi il file hdlist (o synthesis) di \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "o controli il file pubkey di \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...impuartade le clâf %s dal file pubkey di \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no rivi a impuartâ il file pubkey di \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nissun file hdlist cjatât pe font \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "font zontade %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1191,94 +1201,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "o stoi leint i file rpm di [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Sielte falade, torne a provâ\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Cîr"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "o rimôf le font \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1361,315 +1376,6 @@ msgstr "o stoi montant %s"
 msgid "unmounting %s"
 msgstr "o stoi dismontant %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Chest software al è software libar e al po sedi redistribuît sot i termins "
-"de GNU GPL.\n"
-"\n"
-"ûs:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - stampe chist mes di jutori.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - dopre un ambient specific (di solit un rapuart di bug).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - no sta a doprâ les fonts listadis, disseparadis di "
-"virgulis.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - ordene fonts in base a les sotriis disseparadis di "
-"virgulis.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - dopre il file synthesis specificât invezit dal db urpmi\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - dopre il file synthesis specificât invezit dal db urpmi\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - no sta a stampâ riis compagnis.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - dopre dome fonts di atualizazion.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modalitât fetôse.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignore le distinzion tra maiusculis e minusculis in "
-"cualsisei pattern.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - ignore le distinzion tra maiusculis e minusculis in "
-"cualsisei pattern.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-"  -e             - cjape dentri il codis perl diretementri sicu perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - AND binari.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operadôr binari OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NOT unari.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  )              - parentesis di diestre par sierâ un grop di espressions.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - dopre le interface X.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    il valôr predefinît al è %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - stampe il tag url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-"  --buildhost    - stampe il tag buildhost: host di compilazion dal pachet.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --files        - stampe i file tag: ducj i file.\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-"  --conflicts     - stampe il tag conflicts: ducj i conflits rilevâts par il "
-"pachet.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - stampe il tag description: descrizion dal pachet.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - stampe tag epoch: ete.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --all           - stampe ducj i tag.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l         - liste i file presints int'un pachet.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - stampe il tag group: grop.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --all           - stampe ducj i tag.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --all           - stampe ducj i tag.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-"  --obsoletes     - stampe il tag obsolete: dut chel fat deventâ vieli dal "
-"pachet.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - mostre le clâf packager: assembladôr dal pachet.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-"  --provides      - stampe il tag provides: elements furnîts dal pachet.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-"  --requires     - stampe il tag requires: dutis les pretesis dal pachet.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - stampe le tag size: dimension.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - stampe il tag sourcerpm: pachets rpm sorzint.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-"  --obsoletes     - stampe il tag obsolete: dut chel fat deventâ vieli dal "
-"pachet.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - stampe il tag summary: sumari dal pachet.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - stampe il tag url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - modalitât fetôse.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l         - liste i file presints int'un pachet.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - stampe version, release e architeture cun non.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nissun file hdlist cjatât pe font \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "o ai creât il file synthesis pe font \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "o scrîf le liste pe font \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1686,7 +1392,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nissun pachet clamât %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "I pachets seguints e contegnin %s: %s"
@@ -1696,47 +1402,47 @@ msgstr "I pachets seguints e contegnin %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Al è dut dizà instalât"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Al è dut dizà instalât"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Al è dut dizà instalât"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "cause cal mancje %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Al è dut dizà instalât"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "cause che %s no l'è sodisfat"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "ricercje dal miôr pachet %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "par tignî %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1745,7 +1451,7 @@ msgstr ""
 "I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1754,12 +1460,12 @@ msgstr ""
 "I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "par instalâ %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "cause di conflits cun %s"
@@ -1853,6 +1559,13 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1882,39 +1595,39 @@ msgstr "  --verbose, -v  - modalitât fetôse.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - sielç ducj i pachets che cuadrin te espression.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Dome il superutent al po instalâ pachets"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pachets no cognossûts"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pachet no cognossût"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "rimovi il pachet %s al prejudicarâ il to sisteme"
 msgstr[1] "rimovi il pachet %s al prejudicarâ il to sisteme"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nuie di rimovi"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nuie di rimovi"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1924,45 +1637,341 @@ msgstr[0] ""
 msgstr[1] ""
 "Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "pachet no cognossût"
 msgstr[1] "pachet no cognossût"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "rimozion dal pachet %s"
 msgstr[1] "rimozion dal pachet %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "o consideri le font rimovibil sicu \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Rimozion falade"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Rimozion falade"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Chest software al è software libar e al po sedi redistribuît sot i termins "
+"de GNU GPL.\n"
+"\n"
+"ûs:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - stampe chist mes di jutori.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - dopre un ambient specific (di solit un rapuart di bug).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - no sta a doprâ les fonts listadis, disseparadis di "
+"virgulis.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - ordene fonts in base a les sotriis disseparadis di "
+"virgulis.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - dopre il file synthesis specificât invezit dal db urpmi\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - dopre il file synthesis specificât invezit dal db urpmi\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - no sta a stampâ riis compagnis.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - dopre dome fonts di atualizazion.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modalitât fetôse.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignore le distinzion tra maiusculis e minusculis in "
+"cualsisei pattern.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - ignore le distinzion tra maiusculis e minusculis in "
+"cualsisei pattern.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+"  -e             - cjape dentri il codis perl diretementri sicu perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - AND binari.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operadôr binari OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NOT unari.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  )              - parentesis di diestre par sierâ un grop di espressions.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - dopre le interface X.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    il valôr predefinît al è %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - stampe il tag url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+"  --buildhost    - stampe il tag buildhost: host di compilazion dal pachet.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --files        - stampe i file tag: ducj i file.\n"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+"  --conflicts     - stampe il tag conflicts: ducj i conflits rilevâts par il "
+"pachet.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - stampe il tag description: descrizion dal pachet.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - stampe tag epoch: ete.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --all           - stampe ducj i tag.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l         - liste i file presints int'un pachet.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - stampe il tag group: grop.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --all           - stampe ducj i tag.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --all           - stampe ducj i tag.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+"  --obsoletes     - stampe il tag obsolete: dut chel fat deventâ vieli dal "
+"pachet.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - mostre le clâf packager: assembladôr dal pachet.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+"  --provides      - stampe il tag provides: elements furnîts dal pachet.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+"  --requires     - stampe il tag requires: dutis les pretesis dal pachet.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - stampe le tag size: dimension.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - stampe il tag sourcerpm: pachets rpm sorzint.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+"  --obsoletes     - stampe il tag obsolete: dut chel fat deventâ vieli dal "
+"pachet.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - stampe il tag summary: sumari dal pachet.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - stampe il tag url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - modalitât fetôse.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l         - liste i file presints int'un pachet.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - stampe version, release e architeture cun non.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nissun file hdlist cjatât pe font \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "o ai creât il file synthesis pe font \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "o scrîf le liste pe font \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2318,48 +2327,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Instalazion Automatiche"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Instalazion Automatiche"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Cuale ise le to sielte? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2367,7 +2371,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2375,19 +2379,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Continue distès?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (s/N) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2396,7 +2400,7 @@ msgstr ""
 "Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2405,12 +2409,12 @@ msgstr ""
 "Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "rimovi il pachet %s al prejudicarâ il to sisteme"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2421,7 +2425,7 @@ msgstr ""
 "e an di sedi rimovûts par atualizâ altris:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2432,12 +2436,12 @@ msgstr ""
 "e an di sedi rimovûts par atualizâ altris:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2447,7 +2451,7 @@ msgstr ""
 "Tu âs di sedi root par podê instalâ chestis dipendencis: \n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2456,39 +2460,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Scancele"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Frache Enter cuant che tu sês pront..."
@@ -2927,12 +2931,12 @@ msgstr "  -f             - sfuarçe gjenerazion di file hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Dome il superutent al po instalâ pachets"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nuie di atualizâ (dopre urpmi.addmedia par zontâ une font)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2941,17 +2945,17 @@ msgstr ""
 "le vôs di atualizâ e mancje\n"
 "(une di %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Modifiche de font \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "o rimôf le font \"%s\""
diff --git a/po/ga.po b/po/ga.po
index d955a550..4ca4ced3 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2000-04-06 10:25+0100\n"
 "Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
 "Language-Team: Gaeilge <ga@li.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Ag Ullmhaigh feistiú"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, fuzzy, c-format
 msgid "_Ok"
 msgstr "Ceart go Leor"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -45,7 +45,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -55,7 +55,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -65,22 +65,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, fuzzy, c-format
 msgid "_Install"
 msgstr "Ag Feistiú:"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Sábháil"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Cealaigh"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
@@ -171,12 +171,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "pacáiste ar bith den ainm %s"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Fan go fóill, le do thoil..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Gaireas luchóige"
@@ -204,42 +204,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ceart go Leor"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Eirigh as Feistiú"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Tobscoir"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -247,58 +247,65 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d pacáistí"
 msgstr[1] "%d pacáistí"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Á Ullmhú..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, fuzzy, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 "Ag feisteáil pacáiste %s\n"
 "%d%%"
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr ""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Ag feistiál  pacáiste %s"
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "Theip ar uathathmhéadú FAT: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Críochnithe"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -306,28 +313,27 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Theip ag feistiú"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, fuzzy, c-format
 msgid "Installation finished"
 msgstr "Theip ag feistiú"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "ag feistiú %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -399,58 +405,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "Theip ar uathathmhéadú FAT: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -490,22 +490,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -597,82 +597,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "theip ar feistiú"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "kdesu ar iarraidh"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "kdesu ar iarraidh"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "kdesu ar iarraidh"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "ag feistiú %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "Theip ar uathathmhéadú FAT: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "Ag feistiál  pacáiste %s"
@@ -692,58 +697,58 @@ msgstr "tá gach rud ann cheana féin"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "ag feistiú %s\n"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "Theip ar uathathmhéadú FAT: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "ag feistiú %s\n"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Eolais Cuimhne"
@@ -788,75 +793,80 @@ msgstr "Rabhadh"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Theip ag feistiú"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Theip ag feistiú"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "ag feistiú %s\n"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "ag feistiú %s\n"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "ag feistiú %s\n"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "ag feistiú %s\n"
 
-#: ../urpm/main_loop.pm:234
+#: ../urpm/main_loop.pm:242
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+msgid "Try installation without checking dependencies?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
+msgstr "téama le haighaidh taobh an fuinneog"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Theip ag feistiú"
@@ -1058,7 +1068,7 @@ msgstr "Téip cóip do [%s]"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Téip cóip do [%s]"
@@ -1098,32 +1108,32 @@ msgstr "léamh depslist comhad [%s]"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1138,94 +1148,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "TtYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (T/n) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Droch-rogha, athtrialaigh!\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Cuardaigh"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1308,286 +1323,6 @@ msgstr "ag feistiú %s"
 msgid "unmounting %s"
 msgstr "ag feistiú %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr ""
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr ""
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr ""
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr ""
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr ""
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr ""
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr ""
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr ""
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr ""
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Modúl Cumraíochta Konsole"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr ""
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr ""
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr ""
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr ""
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr ""
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr ""
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr ""
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr ""
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr ""
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr ""
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr ""
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr ""
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1604,7 +1339,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Pacáiste ar bith den ainm %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
@@ -1614,66 +1349,66 @@ msgstr "Tá ceann de na pacáistí seo de dhíth:"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "kdesu ar iarraidh"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, fuzzy, c-format
 msgid "due to unsatisfied %s"
 msgstr "kdesu ar iarraidh"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "téama le haighaidh taobh an fuinneog"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "téama le haighaidh taobh an fuinneog"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "kdesu ar iarraidh"
@@ -1759,6 +1494,12 @@ msgstr ""
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1786,39 +1527,39 @@ msgstr ""
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "%d pacáistí"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "gan aithne"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
 msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr ""
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1826,45 +1567,313 @@ msgid_plural ""
 msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
 msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "gan aithne"
 msgstr[1] "gan aithne"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Ag feistiál  pacáiste %s"
 msgstr[1] "Ag feistiál  pacáiste %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (T/n) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Gaireais inscortha"
 
-#: ../urpme:181
+#: ../urpme:185
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Scríos modúil"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Scríos modúil"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr ""
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr ""
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr ""
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr ""
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr ""
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr ""
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr ""
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Modúl Cumraíochta Konsole"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr ""
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr ""
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr ""
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr ""
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr ""
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr ""
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr ""
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr ""
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr ""
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr ""
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr ""
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr ""
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2178,48 +2187,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Eirigh as Feistiú"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Eirigh as Feistiú"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Céard é do rogha? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2227,7 +2231,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2235,38 +2239,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Lean ar aghaidh ar aon nós?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2274,7 +2278,7 @@ msgid ""
 "%s\n"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2282,12 +2286,12 @@ msgid ""
 "%s\n"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2295,46 +2299,46 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
 msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Brú Enter nuair atá sin déanta agat..."
@@ -2742,29 +2746,29 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr ""
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "léamh depslist comhad [%s]"
diff --git a/po/gl.po b/po/gl.po
index a0c9a9e7..646b9fba 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-04-15 18:06+0100\n"
 "Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Instalación de RPMs"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erro: non foi posible atopar o ficheiro %s, cancelarase a operación"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Aceptar"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "Que desexa facer?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -72,7 +72,7 @@ msgstr ""
 "\n"
 "Desexa continuar?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -87,22 +87,22 @@ msgstr ""
 "\n"
 "Podería preferir só gardalo. Que desexa facer?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instalar"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Escolla a localización onde se gardará o ficheiro"
@@ -211,12 +211,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Non especificou ningún paquete"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Agarde..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Debe ser root"
@@ -247,42 +247,42 @@ msgstr ""
 "%s\n"
 "Desexa continua-la instalación de tódolos xeitos?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr "(para actualizar)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr "(para instalar)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Selección de paquetes"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -293,56 +293,63 @@ msgstr ""
 "%s\n"
 "Desexa continuar a instalación de tódolos xeitos?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Para satisface-las dependencias, vanse instala-los seguintes paquetes"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paquete, %d MB)"
 msgstr[1] "(%d paquetes, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Non foi posible consegui-los paquetes fonte, abortando"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando o paquete `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Insira o soporte chamado \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Descargando o paquete `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...fallo ó obter: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Feito"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -353,28 +360,27 @@ msgstr ""
 "%s\n"
 "Pode ser que desexe actualizar a base de datos do seu urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "A instalación fallou:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Xa está todo instalado"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalación rematada"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "eliminando %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
@@ -448,58 +454,52 @@ msgstr "O directorio de ambiente %s non existe"
 msgid "using specific environment on %s\n"
 msgstr "usando ambiente específico en %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "non foi posible abrir rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nome de ficheiro rpm incorrecto [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "obtendo o ficheiro rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...obtención rematada"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...fallo ó obter: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "non foi posible acceder ó ficheiro rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "non foi posible analisar o ficheiro spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "non foi posible rexistrar o ficheiro rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Arquitectura incompatible para rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "erro ó rexistra-los paquetes locais"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Esta operación está prohibida mentres se executa en modo restrinxido"
@@ -541,22 +541,22 @@ msgstr ""
 "por defecto urpmf agarda unha expresión regular. Debería usar a opción \"--"
 "literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "o directorio de chroot non existe"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Non se pode usar %s sen %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Non se pode usar %s con %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
@@ -650,82 +650,87 @@ msgstr "%s fallou: saiu co sinal %d"
 msgid "%s failed: exited with %d"
 msgstr "%s fallou: saiu con %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "fallo ó copiar"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "falta wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "falta curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl fallou: cancelouse a descarga\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "falta rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "falta ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "falta prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Non se puido executar prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "falta aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% de %s completado, TME = %s, velocidade = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% completado, velocidade = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "obtendo %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "obteuse %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocolo descoñecido definido por %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "non foi posible manexar o protocolo: %s"
@@ -745,12 +750,12 @@ msgstr "non se atopou o paquete %s."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "recuperando ficheiros rpm do medio \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, fuzzy, c-format
 msgid "[repackaging]"
 msgstr "[reempaquetando]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -758,47 +763,47 @@ msgstr ""
 "creouse unha transacción para instalar en %s (eliminar=%d, instalar=%d, "
 "actualizar=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "non se puido crear a transacción"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "non foi posible extraer o rpm dende o paquete delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "non foi posible instalar o paquete %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "fallo ó eliminar %s: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Eliminando o paquete %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "eliminando o paquete %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Máis información no paquete %s"
@@ -843,18 +848,23 @@ msgstr "abortando"
 msgid "%s database is locked (another program is already using it)"
 msgstr "A base de datos de %s está bloqueada (xa a está usando outro programa)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "A instalación fallou"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -863,57 +873,57 @@ msgstr ""
 "Fallou a instalación, rpms incorrectos:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "O seguinte paquete ten unha sinatura incorrecta"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "¿Desexa continuar ca instalación?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "eliminando os rpms instalados (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuíndo %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalando %s dende %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instalando %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Os paquetes están actualizados"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "A instalación é viable"
@@ -1121,7 +1131,7 @@ msgstr "fallo ó copiar [%s] (o ficheiro é sospeitosamente pequeno)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "calculando o md5sum do hdlist (ou synthesis) fonte recuperado"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "fallo ó obter [%s] (os md5sum non coinciden)"
@@ -1161,32 +1171,32 @@ msgstr "non se atopou un ficheiro synthesis para o soporte \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinando o ficheiro pubkey de \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importouse a clave %s dende o ficheiro pubkey de \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "non foi posible importar o ficheiro pubkey de \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "non se atopou un ficheiro synthesis para o soporte \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "actualizouse o soporte \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "fallou a obtención de [%s]"
@@ -1201,94 +1211,99 @@ msgstr "intentando de novo co sitio espello %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Non se puido atopar un sitio espello da lista de sitios espello %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "atopouse a xeolocalización %s %.2f %.2f para a zona horaria %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "obtendo a lista de sitios espello dende %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Mala elección, probe de novo\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Paquete"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versión"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Edición"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arquitectura"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(suxerido)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "soporte \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "liña de comandos"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1371,309 +1386,6 @@ msgstr "montando %s"
 msgid "unmounting %s"
 msgstr "desmontando %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf versión %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Isto é software libre e pode redistribuirse baixo os termos da GNU GPL.\n"
-"\n"
-"uso: urpmf [opcións] expresión-patrón\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - amosa o número de versión desta ferramenta.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - usar un ambiente específico (normalmente un informe de "
-"erro).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - non usar os soportes dados, separados por comas.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - non usar patróns, usar o argumento coma unha cadea "
-"literal.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - usar outra raíz para a base de datos de urpmi\n"
-"                   e a instalación de rpms.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - ordenar os soportes de acordo cas cadeas separadas por "
-"comas.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - usar a ruta dada para acceder ó soporte\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - usar o ficheiro synthesis proporcionado no\n"
-"                   canto da base de datos de urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - non amosa as liñas idénticas.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - usar só soportes de actualización.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modo detallado.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignorar a distinción de maiúsculas-minúsculas nos "
-"patróns.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - ignorar a distinción de maiúsculas-minúsculas nos "
-"patróns.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-"  -F<str>        - cambiar o separador de campos (predeterminado ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Expresións patrón:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - todo o texto é analizado coma expresión\n"
-"                   regular, a non ser que se use -l.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inclúe o código perl directamente coma perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operador binario AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operador binario OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NOT unario.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - parénteses esquerdo e dereito.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Lista de etiquetas:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - especifica un formato de saída coma o de printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   exemplo: '%%nome:%%ficheiros'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arquitectura\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - máquina de construcción\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - hora de construcción\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - ficheiros de configuración\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - etiquetas conflictos\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - descrición do paquete\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribución\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr ""
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - nome de ficheiro do paquete\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - lista dos ficheiros contidos no paquete\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grupo\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licenza\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - nome do paquete\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - empaquetador\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - etiquetas proporciona\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - etiquetas require\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - tamaño despois de instalar\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nome do rpm fonte\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - etiquetas suxire\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - resumo\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - vendedor\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - o soporte no que se atopou o paquete\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - imprime a versión, a edición e o nome da arquitectura.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Formato incorrecto: só pode usar unha etiqueta multivaluada"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "non hai un hdlist dispoñible para o soporte \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "non hai un synthesis dispoñible para o soporte \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "non hai xml-info dispoñible para o soporte \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1691,7 +1403,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Non hai ningún paquete que se chame %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Os seguintes paquetes conteñen %s: %s"
@@ -1701,47 +1413,47 @@ msgstr "Os seguintes paquetes conteñen %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Non se poden instalar os paquetes %s"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "O paquete %s xa está instalado"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Os paquetes %s xa están instalados"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "debido a que falta %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "debido ó %s xa instalado"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "debido a %s non satisfeitas"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "para manter %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1750,7 +1462,7 @@ msgstr ""
 "Teñe que eliminarse o seguinte paquete para poder actualizar outros:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1759,12 +1471,12 @@ msgstr ""
 "Teñen que eliminarse os seguintes paquetes para poder actualizar outros:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "para instalar %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "debido a conflictos con %s"
@@ -1858,6 +1570,14 @@ msgstr "  --repackage    - Reempaquetar os ficheiros antes de eliminar\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usar outra raíz para a eliminación de rpms.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - usar outra raíz para a base de datos de urpmi\n"
+"                   e a instalación de rpms.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1888,39 +1608,39 @@ msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selecciona tódolos paquetes que concordan ca expresión.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Só o superusuario pode eliminar paquetes"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "paquetes descoñecidos"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "paquete descoñecido"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Se se elimina o paquete %s o sistema estropearase"
 msgstr[1] "Se se elimina o paquete %s o sistema estropearase"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Non hai nada que eliminar"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Non hai nada que eliminar"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1929,45 +1649,334 @@ msgstr[0] "Para satisfacer as dependencias, vaise eliminar o seguinte paquete"
 msgstr[1] ""
 "Para satisfacer as dependencias, vanse eliminar os seguintes paquetes"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "paquete descoñecido"
 msgstr[1] "paquete descoñecido"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Desexa eliminar %d paquete?"
 msgstr[1] "Desexa eliminar %d paquetes?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Fallo ó eliminar"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Fallo ó eliminar"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf versión %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Isto é software libre e pode redistribuirse baixo os termos da GNU GPL.\n"
+"\n"
+"uso: urpmf [opcións] expresión-patrón\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - amosa o número de versión desta ferramenta.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - usar un ambiente específico (normalmente un informe de "
+"erro).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - non usar os soportes dados, separados por comas.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - non usar patróns, usar o argumento coma unha cadea "
+"literal.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - ordenar os soportes de acordo cas cadeas separadas por "
+"comas.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - usar a ruta dada para acceder ó soporte\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - usar o ficheiro synthesis proporcionado no\n"
+"                   canto da base de datos de urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - non amosa as liñas idénticas.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - usar só soportes de actualización.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modo detallado.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignorar a distinción de maiúsculas-minúsculas nos "
+"patróns.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - ignorar a distinción de maiúsculas-minúsculas nos "
+"patróns.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+"  -F<str>        - cambiar o separador de campos (predeterminado ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Expresións patrón:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - todo o texto é analizado coma expresión\n"
+"                   regular, a non ser que se use -l.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inclúe o código perl directamente coma perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operador binario AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operador binario OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NOT unario.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - parénteses esquerdo e dereito.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Lista de etiquetas:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - especifica un formato de saída coma o de printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   exemplo: '%%nome:%%ficheiros'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arquitectura\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - máquina de construcción\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - hora de construcción\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - ficheiros de configuración\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - etiquetas conflictos\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - descrición do paquete\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribución\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr ""
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - nome de ficheiro do paquete\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - lista dos ficheiros contidos no paquete\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grupo\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licenza\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - nome do paquete\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - empaquetador\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - etiquetas proporciona\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - etiquetas require\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - tamaño despois de instalar\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nome do rpm fonte\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - etiquetas suxire\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - resumo\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - vendedor\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - o soporte no que se atopou o paquete\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - imprime a versión, a edición e o nome da arquitectura.\n"
+
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Expresións patrón:\n"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Formato incorrecto: só pode usar unha etiqueta multivaluada"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "non hai un hdlist dispoñible para o soporte \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "non hai un synthesis dispoñible para o soporte \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "non hai xml-info dispoñible para o soporte \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2325,36 +2334,31 @@ msgstr ""
 "Erro: semella que %s se montou coma de só lectura.\n"
 "Use --allow-force para forzar a operación."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Actualizando soporte...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (para actualizar)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (para actualizar)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (para instalar)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (para instalar)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2362,12 +2366,12 @@ msgid ""
 msgstr ""
 "Para satisfacer a dependencia de '%s', fai falta un dos seguintes paquetes:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "¿Cal é a súa elección? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2378,7 +2382,7 @@ msgstr ""
 "que son máis antigos cós instalados:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2389,7 +2393,7 @@ msgstr ""
 "que son máis antigos cós instalados:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2398,12 +2402,12 @@ msgstr ""
 "\n"
 "¿Continuar a instalación de tódolos xeitos?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2412,7 +2416,7 @@ msgstr ""
 "Non se puido instalar un paquete solicitado:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2421,12 +2425,12 @@ msgstr ""
 "Algún dos paquetes solicitados non se puido instalar:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "Se se elimina o paquete %s o sistema estropearase"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2437,7 +2441,7 @@ msgstr ""
 "paquete para para poder actualizar outros:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2448,12 +2452,12 @@ msgstr ""
 "paquetes para para poder actualizar outros:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(só probar, a eliminación non se fará agora mesmo)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2464,7 +2468,7 @@ msgstr ""
 "seguintes dependencias:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2472,39 +2476,39 @@ msgstr[0] "Para satisfacer as dependencias, vaise eliminar o seguinte paquete"
 msgstr[1] ""
 "Para satisfacer as dependencias, vanse eliminar os seguintes paquetes"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(só probar, a instalación non se fará agora mesmo)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "vanse usar %s de espazo adicional no disco."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "vanse liberar %s de espazo no disco."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "vanse obter %s de paquetes."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Continuar ca instalación dun paquete?"
 msgstr[1] "Continuar ca instalación dos %d paquetes?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Prema Enter cando estea montado..."
@@ -2954,13 +2958,13 @@ msgstr "  -ff            - forzar de verdade a actualización de synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Só o superusuario pode actualizar soportes"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "non hai nada que actualizar (use urpmi.addmedia para engadir un soporte)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2969,17 +2973,17 @@ msgstr ""
 "falta a entrada a actualizar\n"
 "(unha de %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorando o soporte %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "habilitando o soporte %s"
@@ -3263,6 +3267,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Non se atopou o changelog\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Actualizando soporte...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "examinando o ficheiro %s"
 
diff --git a/po/he.po b/po/he.po
index 69093693..76cd162a 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-03-22 15:41+0200\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -24,22 +24,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "התקנת חבילות תוכנה"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "שגיאה: לא ניתן למצוא את הקובץ %s, הפעולה תבוטל"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_המשך"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -60,7 +60,7 @@ msgstr ""
 "\n"
 "מה ברצונך לעשות?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -75,7 +75,7 @@ msgstr ""
 "\n"
 "האם ברצונך להמשיך?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -90,22 +90,22 @@ msgstr ""
 "\n"
 "ייתכן וברצונך רק לשמור את החבילה לדיסק. מה ברצונך לעשות?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_התקנה"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_שמירה"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "עליך לבחור מקום לשמירת הקובץ"
@@ -205,12 +205,12 @@ msgstr "  --searchmedia  - השתמש רק במקור הנתון לחיפוש ה
 msgid "No packages specified"
 msgstr "לא צוינו חבילות"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "נא להמתין..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "עליך להיות בעל הרשאות מנהל מערכת"
@@ -241,42 +241,42 @@ msgstr ""
 "%s\n"
 "האם להמשיך בכל זאת?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "אישור"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (לשדרג)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (להתקין)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "בחירת חבילות"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "אחת החבילות הבאות נדרשת:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_בטל"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -287,56 +287,63 @@ msgstr ""
 "%s\n"
 "האם להמשיך בכל זאת?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "כדי לספק את התלויות, החבילה הבאה הותקן:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "כדי לספק את התלויות החבילות הבאות יותקנו:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(חבילה %d, %d MB)"
 msgstr[1] "(%d חבילות, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "הכנה..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "מתקין חבילה `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "נא להכניס את המדיה בשם \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "מוריד חבילה `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...האיחזור נכשל: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_סיום"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -347,28 +354,27 @@ msgstr ""
 "%s\n"
 "יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "ההתקנה כשלה:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "הכל כבר מותקן"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "ההתקנה הסתיימה"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "מסיר %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "מפעיל מחדש את urpmi"
@@ -442,58 +448,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "שימוש בסביבה מסוימת על  %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "אין אפשרות לפתוח את בסיס הנתונים של החבילות rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "שם החבילה [%s] אינו תקין"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "מאחזר קובץ RPM [%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...האחזור הסתיים"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...האיחזור נכשל: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "הגישה לחבילה [%s] נכשלה"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "אין אפשרות לפענח את קובץ המפרט %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "אין אפשרות לבצע רישום של החבילה"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "האריכטקטורה אינה תואמת את חבילת התוכנה [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "חלה שגיאה בעת רישום חבילות מקומיות"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "פעולה זו אינה מותרת באופן עבודה מוגבל"
@@ -533,22 +533,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "ספרית ה-chroot אינה קיימת"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "לא ניתן להשתמש ב-%s ללא %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "לא ניתן להשתמש ב-%s עם %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "יותר מדי משתנים\n"
@@ -640,82 +640,87 @@ msgstr "%s כשל: הסתיים עם אות %d"
 msgid "%s failed: exited with %d"
 msgstr "%s כשל: הסתיים עם %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "העתקה נכשלה"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget חסר\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl חסר\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl כשל: ההורדה בוטלה\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync חסר\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh חסר\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla חסר\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "לא ניתן להפעיל את prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% מ-%s הושלמו, זמן נותר = %s, מהירות = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% הורדו, מהירות = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "מאחזר %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "אוחזרו %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "פרוטוקול לא מזוהה הוגדר עבור %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "לא נמצא webfetch מבין אלו הנתמכים: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "השימוש בפרוטוקול : %s נכשל"
@@ -735,58 +740,58 @@ msgstr "החבילה %s לא נמצאה."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "מעתיק חבילות תוכנה מהמקור \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[אורז מחדש]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "יצר עסקה עבור התקנה על %s (הסרה=%d, התקנה=%d, עדכון=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "בלתי אפשרי לעשות עסקה"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "אין אפשרות לחלץ rpm מתוך חבילת delta-rpm ששמה %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "התקנת החבילה %s נכשלה"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "מסיר חבילה תקולה (%s) מתוך %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "הסרת %s נכשלה: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "מסיר חבילה %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "מסיר חבילה %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "מסיר חבילות מותקנות (%s) מתוך %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "מידע נוסף על החבילה %s"
@@ -831,18 +836,23 @@ msgstr "נוטש"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "ההתקנה נכשלה"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -851,57 +861,57 @@ msgstr ""
 "ההתקנה כשלה, חבילות תקולות:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "לחבילות הבאות יש בעיה בחתימות"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "לחבילות הבאות יש בעיה בחתימות"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "האם להמשיך בתהליך ההתקנה?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "מסיר חבילות מותקנות (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "מפיץ %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "מתקין את %s מתוך %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "מתקין %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*לא)"
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "החבילות עדכניות"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "ניתן לבצע את ההתקנה"
@@ -1105,7 +1115,7 @@ msgstr "העתקת [%s] נכשלה (הקובץ קטן מהמצופה)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "מחשב חתימות md5sum של קובץ synthesis"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "אחזור [%s] נכשל (חתימת md5sum אינה תואמת)"
@@ -1145,32 +1155,32 @@ msgstr "לא נמצא קובץ synthesis עבור מאגר \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "מוריד את קובץ synthesis של \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "בודק קובץ מפתחות ציבורי של \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ".. מפתח %s מיובא מתוך קובץ ציבורי של \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "לא יכול לייבוא קובץ של מפתח ציבורי של \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "לא נמצא קובץ synthesis עבור מאגר \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "המקור \"%s\" עודכן"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1185,94 +1195,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "מייבא רשימת אתרי מראה מ- %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "כfFטyY"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (כן/*לא) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "מצטער ,בחירה רעה, יש לנסות שנית\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "חבילה"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "גרסה"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "שחרור"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "ארכיטקטורה"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "מקור \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1355,295 +1370,6 @@ msgstr "מחבר את %s"
 msgid "unmounting %s"
 msgstr "מנתק את %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"גרסת urpmf %s\n"
-"כל הזכויות שמורות (C) 2002-2006 Mandriva.\n"
-"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL.\n"
-"\n"
-"\n"
-"שימוש: urpmf [אפשרויות] ביטוי לדפוס\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version     - הדפסת מספר הגרסה של כלי זה.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - שימוש בסביבה מסויימת (בדרך כלל דיווח על בעיה).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - do not use the given media, separated by comma.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root         - השתמש בשורש מערכת קבצים אחר ל-urpmi db והתקנת rpm\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - השתמש בנתיב שהוגדר כדי לגשת למקור\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - השתמש בקובץ synthesis המוגדר במקום בסיס הנתונים של "
-"urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - אל תדפיס שורות זהות פעמיים.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       -שימוש במאגר העדכונים בלבד.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose mode.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignore case distinctions in patterns.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include perl code directly as perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - אופרטור AND בינארי.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - אופרטור OR בינארי.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - שלילה של מרכיב.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "רשימת תגים:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr ""
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch          - ארכיטקטורה\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr ""
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - תיאור החבילה\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - הפצה\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr ""
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename         - שם הקובץ של החבילה\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -files             - רשימת הקבצים הכלולים בחבילה.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - קבוצה\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr ""
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - שם החבילה\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - האורז\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         -  גודל מותקן\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr ""
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - המקור בו נמצאה החבילה\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - הדפסת גרסה, שחרור וארכיון עם שם.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "אין קבצי hdlist זמינים עבור המקור \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "אין קבצי synthesis עבור המקור \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "אין קבצי xml info זמינים עבור המקור \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1660,7 +1386,7 @@ msgstr "urpmi אותחל ורשימת החבילות הדחופות השתנתה
 msgid "No package named %s"
 msgstr "לא נמצאה חבילה בשם %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "החבילות הבאות מכילות את %s: %s"
@@ -1670,47 +1396,47 @@ msgstr "החבילות הבאות מכילות את %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "לא ניתן להתקין את החבילות %s"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "החבילה %s כבר מותקנת"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "החבילות %s כבר מותקנות"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "עקב %s חסר"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "בגלל החבילה %s שכבר מותקנת"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "עקב תלות %s שלא מולאה"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "מנסה לקדם %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "בכדי לשמור %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1719,7 +1445,7 @@ msgstr ""
 "החבילה הבאה עומדת להימחק כדי שניתן יהיה לשדרג חבילות אחרות: \n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1728,12 +1454,12 @@ msgstr ""
 "החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "בכדי להתקין %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "עקב התנגשות עם %s"
@@ -1825,6 +1551,13 @@ msgstr "  --repackage    - אריזה מחדש של הקובץ לפני מחיק
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - שימוש בשורש אחר לצורך הסרת חבילות תוכנה.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root         - השתמש בשורש מערכת קבצים אחר ל-urpmi db והתקנת rpm\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1854,39 +1587,39 @@ msgstr ""
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "רק מנהל מערכת מורשה להסיר חבילות תוכנה"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "חבילות לא מוכרות"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "חבילה לא מוכרת"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "הסרת החבילה %s תגרום נזק למערכת"
 msgstr[1] "הסרת החבילה %s תגרום נזק למערכת"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "אין מה להסיר"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "אין מה להסיר"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1894,45 +1627,321 @@ msgid_plural ""
 msgstr[0] "בכדי לענות על התלויות החבילה הבאה תוסר"
 msgstr[1] "כדי לענות על התלויות, %d החבילות הבאות ייוסרו"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "חבילה לא מוכרת"
 msgstr[1] "חבילה לא מוכרת"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "להסיר חבילה %d?"
 msgstr[1] "להסיר %d חבילות?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (כן/*לא) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "ההסרה נכשלה"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "ההסרה נכשלה"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"גרסת urpmf %s\n"
+"כל הזכויות שמורות (C) 2002-2006 Mandriva.\n"
+"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL.\n"
+"\n"
+"\n"
+"שימוש: urpmf [אפשרויות] ביטוי לדפוס\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version     - הדפסת מספר הגרסה של כלי זה.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - שימוש בסביבה מסויימת (בדרך כלל דיווח על בעיה).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - do not use the given media, separated by comma.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - השתמש בנתיב שהוגדר כדי לגשת למקור\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - השתמש בקובץ synthesis המוגדר במקום בסיס הנתונים של "
+"urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - אל תדפיס שורות זהות פעמיים.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       -שימוש במאגר העדכונים בלבד.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose mode.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignore case distinctions in patterns.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include perl code directly as perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - אופרטור AND בינארי.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - אופרטור OR בינארי.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - שלילה של מרכיב.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "רשימת תגים:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr ""
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch          - ארכיטקטורה\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr ""
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - תיאור החבילה\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - הפצה\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr ""
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename         - שם הקובץ של החבילה\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -files             - רשימת הקבצים הכלולים בחבילה.\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - קבוצה\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr ""
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - שם החבילה\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - האורז\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         -  גודל מותקן\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr ""
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - המקור בו נמצאה החבילה\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - הדפסת גרסה, שחרור וארכיון עם שם.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "אין קבצי hdlist זמינים עבור המקור \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "אין קבצי synthesis עבור המקור \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "אין קבצי xml info זמינים עבור המקור \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2271,48 +2280,43 @@ msgstr ""
 "שגיאה: נראה ו-%s עוגן לקריאה בלבד.\n"
 "עליך להשתמש ב --allow-force לאלץ פעולה זו."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "מעדכן מקור...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (לשדרג)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (לשדרג)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (להתקין)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (להתקין)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "בכדי לענות על התלות '%s' דרושה אחת החבילות הבאות:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "מה היא בחירתך? (1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2323,7 +2327,7 @@ msgstr ""
 "מגרסאות קודמות לאלו המותקנות:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2334,7 +2338,7 @@ msgstr ""
 "מגרסאות קודמות מאלו המותקנות במחשבך:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2343,12 +2347,12 @@ msgstr ""
 "\n"
 "האם להמשיך בכל זאת?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "אישור/ביטול (*כ/ל) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2357,7 +2361,7 @@ msgstr ""
 "לא ניתן להתקין חבילה מבוקשת:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2366,12 +2370,12 @@ msgstr ""
 "לא יכול להתקין כמה חבילות מבוקשות:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "הסרת החבילה %s תגרום נזק למערכת"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2382,7 +2386,7 @@ msgstr ""
 "כדי לשדרג אחרות:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2393,12 +2397,12 @@ msgstr ""
 "יש צורך להסיר אותן, בכדי לשדרג את האחרות:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(בדיקה בלבד, ההסרה לא תבוצע למעשה)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2408,46 +2412,46 @@ msgstr ""
 "יש צורך לקרוא ל-urpmi עם --buildrequires תחילה כדי להתקין את התלויות הבאות:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "בכדי לענות על התלויות החבילה הבאה תוסר"
 msgstr[1] "כדי לענות על התלויות, %d החבילות הבאות ייוסרו"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(בדיקה בלבד, ההתקנה לא תבוצע למעשה)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "יעשה שימוש ב-%s שטח כונן נוסף."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s שטח בכונן יפונה."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s של חבילות יאוחזרו."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "להמשיך בהתקנת החבילה?"
 msgstr[1] "להמשיך בהתקנת %d החבילות?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr ""
@@ -2872,12 +2876,12 @@ msgstr "  -f             - באמת אלץ עדכון synthesis.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "רק מנהל מערכת מורשה לעדכן מקור תוכנה"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "אין מה לעדכן (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2886,17 +2890,17 @@ msgstr ""
 "לא חסרה שום כניסה המיועדת לעדכון\n"
 "(אחד מ %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "מתעלם ממקור \"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "מאפשר את המקור %s"
@@ -3162,6 +3166,9 @@ msgstr "אין מידע ב-xml למקור \"%s\", אין כל תוצאה עבו�
 msgid "No changelog found\n"
 msgstr "לא נמצאה רשימת שינויים\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "מעדכן מקור...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "בודק את קובץ %s"
 
diff --git a/po/hi.po b/po/hi.po
index 0d78ad96..73ec2388 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-08-23 20:11+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: Hindi, India\n"
@@ -18,22 +18,22 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "आरपीएम संसाधन"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "ठीक (_O)"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "आप क्या करना चाहते है?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -69,7 +69,7 @@ msgstr ""
 "\n"
 "किया जाएँ?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -84,22 +84,22 @@ msgstr ""
 "\n"
 "आप हो सकता है कि इसे सिर्फ़ सुरक्षित करना चाहते है । आपकी पसन्द क्या है?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "संसाधन (_I)"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "सुरक्षित (_S)"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "खत्म करें (_C)"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "संचिका को सुरक्षित करने के स्थान का चयन करें"
@@ -205,12 +205,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "%s नाम का कोई पैकेज नहीं है"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "कृपया प्रतीक्षा करें..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "रूट होना चाहिए"
@@ -240,42 +240,42 @@ msgstr ""
 "निवेदित किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
 "%sजारी रहा जाएँ?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "ओ०के०"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr "(अपग्रेड के लिए)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr "(संसाधन के लिए)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "पैकेज चयन"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "निम्नलिखित पैकेजों में से एक की आवश्यकता है:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "निष्फ़ल (_A)"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -285,14 +285,14 @@ msgstr ""
 "अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
 "%sजारी रहा जाएँ?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेज का संसाधन होने जा रहा है(%d एमबी)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -300,44 +300,51 @@ msgstr ""
 "अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
 "%s\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d पैकेज"
 msgstr[1] "%d पैकेज"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "तैयारी की जा रही है..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "किया गया(_D)"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -348,28 +355,27 @@ msgstr ""
 "%s\n"
 "आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "संसाधन असफ़ल"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "संसाधन समाप्त"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s को हटाया जा रहा है"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
@@ -443,58 +449,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "अवैध आर०पी०एम० संचिका नाम [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "आर०पी०एम० संचिका [%s] को पुनः प्राप्त किया जा रहा है..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...पुनः प्राप्त करने की क्रिया संपन्न"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "आर०पी०एम० संचिका [%s] को पाने में असमर्थ"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "\"%s\" का पदभंजन [%s] संचिका में करने में असमर्थ"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "आर०पी०एम० संचिका का पंजीकरण में असमर्थ"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "स्थानीय पैकेजों का पंजीकरण करने में त्रुटि"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "सीमित विधा में चलते समय, इस संक्रिया को मनाही है"
@@ -534,22 +534,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -641,82 +641,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "प्रतिलिपि बनना असफ़ल"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "%s के ना मिलने के कारण"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "%s के ना मिलने के कारण"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "%s के ना मिलने के कारण"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "%s को हटाया जा रहा है"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "अज्ञात प्रोटोकॉल %s के लिए परिभाषित"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "कोई वेबफ़ेच्च नहीं मिला, समर्थित वेबफ़ेच्च है:  %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "प्रोटोकॉल: %s को काबू करने में असमर्थ"
@@ -736,12 +741,12 @@ msgstr "%s पैकेज नहीं मिला"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "\"%s\" माध्यम से आर०पी०एम० संचिकाऐं पुनः प्राप्त की जा रही है..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -749,47 +754,47 @@ msgstr ""
 "%s पर संसाधन करने के लिए कार्य-संपादन का निर्माण किया गया (हटाना=%d, संसाधन=%d, "
 "उन्नयन=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "कार्य संपादन का निर्माण करने में असमर्थ"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "delta-rpm पैकेज %s से आरपीएम को बाहर निकालने में असमर्थ"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s पैकेज को संसाधन करने में असमर्थ"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "%s को %s से संसाधित किया जा रहा है"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "%s पैकेज को हटाया जा रहा है"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "%s पैकेज को हटाया जा रहा है"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "%s को %s से संसाधित किया जा रहा है"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "%s पैकेज के बारे में और अधिक सूचना"
@@ -834,75 +839,80 @@ msgstr "चेतावनी"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "संसाधन असफ़ल"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "संसाधन असफ़ल"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "क्या आप संसाधन जारी रखना चाहते है ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "%s को %s से संसाधित किया जा रहा है"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "%s वितिरण किया जा रहा है"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s को %s से संसाधित किया जा रहा है"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s का संसाधन किया जा रहा है"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "संसाधन का प्रयास बिना आधिनताओं की जाँच किये हुए किया जाये?  (हाँ/ना)(y/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)?  (हाँ/ना)(y/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "संसाधन संभव है"
@@ -1109,7 +1119,7 @@ msgstr ""
 "पुनः प्राप्त की हुई स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) के एम०डी०५सम (md5sum) की "
 "गणना की जा रही है"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] की प्रतिलिपि अयोग्य है (एमडी५सम बेमेल है)"
@@ -1149,32 +1159,32 @@ msgstr "\"%s\" माध्यम के लिए कोई हार्डड�
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" की मूल (या कृत्रिम) हार्डडिस्क सूची पुनः प्राप्त की जा रही है..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" की सामान्यजन कूंजी संचिका का निरीक्षण किया जा रहा है..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\" की पब्लिककुंजी संचिका से %s कुंजी आयातित कर ली गई है"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" की सामान्यजनकुंजी संचिका को आयात करने में असमर्थ"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "%s माध्यम को जोड़ा गया"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1189,94 +1199,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "[%s] से आर०पी०एम० संचिकाओं को पढ़ा जा रहा है"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr "(हाँ/ना:y/N)"
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "क्षमा करें, खराब पसन्द, पुनः प्रयास करें\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "पैकेज चयन"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "खोज"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "\"%s\" माध्यम को हटाया जा रहा है"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1359,300 +1374,6 @@ msgstr "%s को आरोह (माउन्ट) किया जा रह�
 msgid "unmounting %s"
 msgstr "%s को अवरोह (अनमाउन्ट) किया जा रहा है"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"यू०आर०पी०एम०एफ़० संस्मरण %s\n"
-"सर्वाधिकार (C) २००२-२००४ मैनड्रिव सॉफ़्ट ।\n"
-"यह एक मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकार-पत्रके अन्तर्गत पुनः वितरित किया "
-"जा सकता है।\n"
-"\n"
-"उपयोग विधि:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - यह सहायता संदेश मुद्रित करें\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - विशिष्ट वातावरण का उपयोग (आदर्श रूप में एक दोष रिपोर्ट)\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - दिये हुए मीडीया का उपयोग ना करें, छोटे विराम चिह्न के द्वारा अलग "
-"किये हुए\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - मीडीया को कॉमा के द्वारा अलग की हुई सहायक-कड़ियों के अनुसार क्रम "
-"में लगाना\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - एक जैसे वाक्यों को मुद्रित ना करें\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - सिर्फ़ अपडेट माध्यम का ही उपयोग करें\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - पर्ल कोड को perl -e जैसे सीधे सम्मलित\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - द्विआधारी \"और\" प्रवर्तक (ऑपरेटर).\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - द्विआधारी \"या\" प्रवर्तक (ऑपरेटर).\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - एकल \"नहीं\".\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - दाहिना कोष्टक का चिह्न समूह अभिव्यक्ति का बंद करने के लिए\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"डाटा की सूची जिसे पुनःस्थापित करना है:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - एक्स (X) इन्टरफ़ेस का उपयोग करें\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    %s डिफ़ाल्ट है ।\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - टैग होस्ट निर्माणकर्ता को मुद्रित करना: होस्ट निर्माणकर्ता\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "संरचना फ़ाइल में परिवर्तनों को लागू करें"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - टैग के विरोधाभासों को मुद्रित करें: सभी विरोधाभास\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - टैग इपॉच्च को मुद्रित करें: इपॉच्च\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - टैग समूह को मुद्रित करें: समूह\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     -  टैग की उपलब्धियां मुद्रित करें: सभी उपलब्धियां\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - टैग आकार को मुद्रित करें: आकार\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - टैग स्रोत्र आर०पी०एम० को मुद्रित करें: स्रोत्र आर०पी०एम०\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S    - सारांश को मुद्रित करना।\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - \tमुद्रित संस्मरण, विमोचन और आर्च नाम के साथ\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "\"%s\" माध्यम के लिए हार्डडिस्क-सूची की कृत्रिम संचिका बनायें"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1669,7 +1390,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "%s नाम का कोई पैकेज नहीं है"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "निम्नलिखित पैकेज %s को समाहित करते है:  %s"
@@ -1679,47 +1400,47 @@ msgstr "निम्नलिखित पैकेज %s को समाहि
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "%s के ना मिलने के कारण"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "असन्तुष्ट %s के कारण"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s को प्रोत्साहित करने का प्रयास किया जा रहा है"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s को रखने के लिए"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1728,7 +1449,7 @@ msgstr ""
 "अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1737,12 +1458,12 @@ msgstr ""
 "अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s को संसाधित के लिए"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s के साथ विरोधाभास के कारण"
@@ -1835,6 +1556,12 @@ msgstr "  --packager     - टैग पैकेजर को मुद्र�
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - आरपीएम को हटाने के अन्य रूट का उपयोग\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1865,39 +1592,39 @@ msgstr "  --verbose      - शब्दों का वॄथा प्रय�
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - मिलती हुई अभिव्यक्तियों वाले सभी पैकेजों का चयन करें\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "सिर्फ़ रूट यूज़र को ही पैकेजों को हटाने की अनुमति है"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "पैकेजों का प्रकार अज्ञात"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "अज्ञात पैकेज"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
 msgstr[1] "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "हटाने को कुछ भी नहीं"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "हटाने को कुछ भी नहीं"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1907,45 +1634,327 @@ msgstr[0] ""
 msgstr[1] ""
 "अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "अज्ञात पैकेज"
 msgstr[1] "अज्ञात पैकेज"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%s पैकेज को हटाया जा रहा है"
 msgstr[1] "%s पैकेज को हटाया जा रहा है"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr "(हाँ/ना:y/N)"
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "हटाने-योग्य साधनों को \"%s\" की भांति लिया जा रहा है"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "हटाना असफ़ल"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "हटाना असफ़ल"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"यू०आर०पी०एम०एफ़० संस्मरण %s\n"
+"सर्वाधिकार (C) २००२-२००४ मैनड्रिव सॉफ़्ट ।\n"
+"यह एक मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकार-पत्रके अन्तर्गत पुनः वितरित किया "
+"जा सकता है।\n"
+"\n"
+"उपयोग विधि:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - यह सहायता संदेश मुद्रित करें\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - विशिष्ट वातावरण का उपयोग (आदर्श रूप में एक दोष रिपोर्ट)\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - दिये हुए मीडीया का उपयोग ना करें, छोटे विराम चिह्न के द्वारा अलग "
+"किये हुए\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - मीडीया को कॉमा के द्वारा अलग की हुई सहायक-कड़ियों के अनुसार क्रम "
+"में लगाना\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - एक जैसे वाक्यों को मुद्रित ना करें\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - सिर्फ़ अपडेट माध्यम का ही उपयोग करें\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - पर्ल कोड को perl -e जैसे सीधे सम्मलित\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - द्विआधारी \"और\" प्रवर्तक (ऑपरेटर).\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - द्विआधारी \"या\" प्रवर्तक (ऑपरेटर).\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - एकल \"नहीं\".\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - दाहिना कोष्टक का चिह्न समूह अभिव्यक्ति का बंद करने के लिए\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"डाटा की सूची जिसे पुनःस्थापित करना है:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - एक्स (X) इन्टरफ़ेस का उपयोग करें\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    %s डिफ़ाल्ट है ।\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - टैग होस्ट निर्माणकर्ता को मुद्रित करना: होस्ट निर्माणकर्ता\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "संरचना फ़ाइल में परिवर्तनों को लागू करें"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - टैग के विरोधाभासों को मुद्रित करें: सभी विरोधाभास\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - टैग इपॉच्च को मुद्रित करें: इपॉच्च\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - टैग समूह को मुद्रित करें: समूह\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     -  टैग की उपलब्धियां मुद्रित करें: सभी उपलब्धियां\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - टैग आकार को मुद्रित करें: आकार\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - टैग स्रोत्र आर०पी०एम० को मुद्रित करें: स्रोत्र आर०पी०एम०\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S    - सारांश को मुद्रित करना।\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - \tमुद्रित संस्मरण, विमोचन और आर्च नाम के साथ\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "\"%s\" माध्यम के लिए हार्डडिस्क-सूची की कृत्रिम संचिका बनायें"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2291,48 +2300,43 @@ msgstr ""
 "त्रुटि: सम्भवता %s को सिर्फ़-पढ़ने-के लिए माउन्ट किया गया लगता है ।\n"
 "इस प्रक्रिया को बल-पूर्वक करने के लिए --allow-force विकल्प का उपयोग करें ।"
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "(अपग्रेड के लिए)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "(अपग्रेड के लिए)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "(संसाधन के लिए)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "(संसाधन के लिए)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "आपकी क्या इच्छा है?  (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2343,7 +2347,7 @@ msgstr ""
 "संसाधित किये जा चुके पैकेजो से पहिले के है:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2354,19 +2358,19 @@ msgstr ""
 "संसाधित किये जा चुके पैकेजो से पहिले के है:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "कुछ भी हो जारी रहा जायें?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "(हाँ/ना:Y/n)"
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2375,7 +2379,7 @@ msgstr ""
 "निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2384,12 +2388,12 @@ msgstr ""
 "निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2400,7 +2404,7 @@ msgstr ""
 "निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2411,12 +2415,12 @@ msgstr ""
 "निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2426,7 +2430,7 @@ msgstr ""
 "निम्नलिखित आधिनताओं को संसाधित करने लिए, आपको महाउपयोगकर्ता होना चाहिए:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2435,39 +2439,39 @@ msgstr[0] ""
 msgstr[1] ""
 "अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "निरस्त"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
@@ -2911,14 +2915,14 @@ msgstr "  -f             - हार्डडिस्क सूची संच
 msgid "Only superuser is allowed to update media"
 msgstr "सिर्फ़ महाउपयोगकर्ता को ही माध्यम को अपडेट करने की अनुमति है"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "अपडेट करने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए "
 "करें)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2927,17 +2931,17 @@ msgstr ""
 "अपडेट की जाने वाली प्रविष्टि लुप्त है\n"
 "(%s में से एक)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" माध्यम की ओर ध्यान नहीं दिया जा रहा है"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "\"%s\" माध्यम को सक्रिय किया जा रहा है"
diff --git a/po/hr.po b/po/hr.po
index 9c3f1041..37cef9ba 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-01-04 21:27+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Pripremam instalaciju"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_U redu"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -44,7 +44,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
 "%s\n"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -66,22 +66,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "Instaliraj"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Spremi"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, fuzzy, c-format
 msgid "Choose location to save file"
 msgstr "Izaberite datoteku"
@@ -182,12 +182,12 @@ msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 msgid "No packages specified"
 msgstr "Naredba nije specificirana"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Molim pričekajte..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Port miša"
@@ -217,42 +217,42 @@ msgstr ""
 "Naki traženi paketi ne mogu biti instalirani:\n"
 "%s"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Dogradnja"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Izlaz iz instalacije"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od slijedećih paketa je potreban:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -260,21 +260,21 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Slijedeći paketi će biti uklonjeni"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -282,37 +282,44 @@ msgstr[0] "%d paketa"
 msgstr[1] "%d paketa"
 msgstr[2] "%d paketa"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Instaliram pakete..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...dohvaćanje neuspješno: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Gotov"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -322,28 +329,27 @@ msgstr ""
 "Instalacija neuspješna, neke datoteke nedostaju.\n"
 "Možda ćete poželjeti dograditi vašu urpmi bazu"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalacija nije uspjela"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalirano"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Uklanjam %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartam urpmi"
@@ -419,58 +425,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "koristim posebno okružje na %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nepravilno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dohvaćam hdlists datoteku..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...dohvat završen"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...dohvaćanje neuspješno: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu registrirati rpm datoteku"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "greška prilikom registriranja lokalnih paketa"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -510,22 +510,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -617,82 +617,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "...kopiranje neuspješno"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "zbog nezadovoljavajućeg %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "zbog nezadovoljavajućeg %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "zbog nezadovoljavajućeg %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "Uklanjam %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...dohvaćanje neuspješno: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "definiran je nepoznati protokol za %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
@@ -712,12 +717,12 @@ msgstr "paket %s nije pronađen."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -725,47 +730,47 @@ msgstr ""
 "Napravljena razmjena za instalaciju na %s (makni=%d, instaliraj=%d, "
 "unaprijedi=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "Ne mogu napraviti ssh identitet"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "Izaberite vaše pakete"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "Problem prilikom instaliranja paketa %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "instaliram %s\n"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...dohvaćanje neuspješno: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "Instaliram paket %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "Instaliram paket %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "instaliram %s\n"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Izaberite vaše pakete"
@@ -810,75 +815,80 @@ msgstr "Upozorenje"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Slijedeći paketi će biti instalirani"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Slijedeći paketi će biti instalirani"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Želite li nastaviti instalaciju?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "instaliram %s\n"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "instaliram %s\n"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "instaliram %s\n"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "instaliram %s\n"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Problem u instalaciji"
@@ -1080,7 +1090,7 @@ msgstr "kopiranje [%s] neuspješno"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] neuspješno"
@@ -1120,32 +1130,32 @@ msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "dohvaćam hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "kopiranje opisne datoteke od \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "dodan medij %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1160,94 +1170,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "nisu pronađene rpm datoteke u [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyDd"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (d/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Žalim, loš odabir, pokušajte ponovo\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "potraga"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1331,308 +1346,6 @@ msgstr "montiram %s"
 msgid "unmounting %s"
 msgstr "odmontiravam %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmq inačica %s\n"
-"Autorska prava (C) 2000, 2001, 2002 Mandriva.\n"
-"Ovo je slobodan software i može biti redistribuiran pod stavkama GNU GPLa.\n"
-"\n"
-"uporaba:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - koristi specifično okružje (tipično izvješće o grešci).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --media        - koristi samo medije popisane zarezom.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, fuzzy, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --media        - koristi samo medije popisane zarezom.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - koristi datu synthesu umjesto urpmi db.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - koristi datu synthesu umjesto urpmi db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr ""
-"  -P             - nemoj pretraživati u provides kako bi pronašli paket.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo medije za dogradnju.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - opširan mod.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binarni AND operator.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binarni OR operator.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -o             - binarni OR operator.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  -o             - binarni OR operator, istinit ukoliko je jedan izraz "
-"istinit.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Popis podataka za povrat:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - koristi X sučelje.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-"\n"
-"                    DrakBackup Report detalji\n"
-"\n"
-"\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Alat za podešavanje Konzole"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-"  --conflicts     - ispisuje oznaku conflicts: sve konflikte (više linija)."
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - ispisuje oznaku description: opis."
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr ""
-"  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --group         -ispisuje oznaku group: grupu."
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-"  --provides      - ispisuje oznaku provides: sve što pruža (više linija)."
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-"  --requires      - ispisuje oznaku requires: sve što zahtjeva (više linija)."
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --group         -ispisuje oznaku group: grupu."
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - ispisuje oznaku summary: sažeto."
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -v             - opširan mod.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr ""
-"  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1649,7 +1362,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Ne postoji paket pod nazivom %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Slijedeći paketi sadrže %s: %s"
@@ -1659,66 +1372,66 @@ msgstr "Slijedeći paketi sadrže %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "zbog nezadovoljavajućeg %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog nezadovoljavajućeg %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "odabirem %s izabiranjem datoteka"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "kako bi se zadržalo %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Slijedeći paketi će biti uklonjeni"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Slijedeći paketi će biti uklonjeni"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "kako bi se zadržalo %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zbog sukoba sa %s"
@@ -1809,6 +1522,12 @@ msgstr "  --group         -ispisuje oznaku group: grupu."
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1836,22 +1555,22 @@ msgstr "  -v             - opširan mod.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "Izaberite vaše pakete"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "Nepoznata greška"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1859,17 +1578,17 @@ msgstr[0] "uklanjanje paketa %s će pokvariti vaš sustav\n"
 msgstr[1] "uklanjanje paketa %s će pokvariti vaš sustav\n"
 msgstr[2] "uklanjanje paketa %s će pokvariti vaš sustav\n"
 
-#: ../urpme:126
+#: ../urpme:128
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Nema oznake za uklanjanje"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nema oznake za uklanjanje"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1881,7 +1600,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1889,7 +1608,7 @@ msgstr[0] "Nepoznata greška"
 msgstr[1] "Nepoznata greška"
 msgstr[2] "Nepoznata greška"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1897,31 +1616,321 @@ msgstr[0] "Instaliram paket %s"
 msgstr[1] "Instaliram paket %s"
 msgstr[2] "Instaliram paket %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (d/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "uzimam prenosivi uređaj kao \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Prijava nije uspjela"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Prijava nije uspjela"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmq inačica %s\n"
+"Autorska prava (C) 2000, 2001, 2002 Mandriva.\n"
+"Ovo je slobodan software i može biti redistribuiran pod stavkama GNU GPLa.\n"
+"\n"
+"uporaba:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - koristi specifično okružje (tipično izvješće o grešci).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, fuzzy, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --media        - koristi samo medije popisane zarezom.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, fuzzy, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --media        - koristi samo medije popisane zarezom.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - koristi datu synthesu umjesto urpmi db.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - koristi datu synthesu umjesto urpmi db.\n"
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr ""
+"  -P             - nemoj pretraživati u provides kako bi pronašli paket.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo medije za dogradnju.\n"
+
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - opširan mod.\n"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binarni AND operator.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binarni OR operator.\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -o             - binarni OR operator.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  -o             - binarni OR operator, istinit ukoliko je jedan izraz "
+"istinit.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Popis podataka za povrat:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - koristi X sučelje.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+"\n"
+"                    DrakBackup Report detalji\n"
+"\n"
+"\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Alat za podešavanje Konzole"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+"  --conflicts     - ispisuje oznaku conflicts: sve konflikte (više linija)."
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - ispisuje oznaku description: opis."
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr ""
+"  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --group         -ispisuje oznaku group: grupu."
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+"  --provides      - ispisuje oznaku provides: sve što pruža (više linija)."
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+"  --requires      - ispisuje oznaku requires: sve što zahtjeva (više linija)."
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --group         -ispisuje oznaku group: grupu."
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - ispisuje oznaku summary: sažeto."
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -v             - opširan mod.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr ""
+"  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2267,36 +2276,31 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Dogradnja"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Dogradnja"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Izlaz iz instalacije"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Izlaz iz instalacije"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2304,12 +2308,12 @@ msgid ""
 msgstr ""
 "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Izaberite jedan? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2317,7 +2321,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2325,19 +2329,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Da ipak nastavim?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2346,7 +2350,7 @@ msgstr ""
 "Naki traženi paketi ne mogu biti instalirani:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2355,12 +2359,12 @@ msgstr ""
 "Naki traženi paketi ne mogu biti instalirani:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će pokvariti vaš sustav\n"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2370,7 +2374,7 @@ msgstr ""
 "neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
 "uvijek nije podržano\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2380,12 +2384,12 @@ msgstr ""
 "neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
 "uvijek nije podržano\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2395,7 +2399,7 @@ msgstr ""
 "Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2406,27 +2410,27 @@ msgstr[1] ""
 msgstr[2] ""
 "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2434,12 +2438,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pritisnite Enter kada ste gotovi..."
@@ -2876,13 +2880,13 @@ msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nema ništa za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2891,17 +2895,17 @@ msgstr ""
 "nedostaje unos za nadogradnju\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Mijenjam medij \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "uklanjam medij \"%s\""
diff --git a/po/hu.po b/po/hu.po
index 066a1337..286284bc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-2009.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-07 21:39+0100\n"
 "Last-Translator: Lónyai Gergely <aleph@mandriva.org>\n"
 "Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -24,32 +24,30 @@ msgstr ""
 "X-Poedit-Country: HUNGARY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../gurpmi:31
-#: ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-telepítés"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Hiba: %s nevű fájl nem található - a művelet megszakítva"
 
-#: ../gurpmi:46
-#: ../gurpmi2:174
-#: ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -62,8 +60,7 @@ msgstr ""
 "\n"
 "Mit szeretne tenni?"
 
-#: ../gurpmi:74
-#: ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -78,7 +75,7 @@ msgstr ""
 "\n"
 "Kívánja folytatni?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -93,34 +90,33 @@ msgstr ""
 "\n"
 "Választhatja azt is, hogy csak elmenti a csomagot. Mit szeretne tenni?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Telepítés"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "M_entés"
 
-#: ../gurpmi:100
-#: ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Mégsem"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Válasszon helyet a fájlnak"
 
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
 #, c-format
 msgid ""
 "urpmi 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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -135,44 +131,36 @@ msgstr ""
 msgid "Options:"
 msgstr "Opciók:"
 
-#: ../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 ../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 "  --help         - jelen segítség megjelenítése\n"
 
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
 msgstr ""
 "  --auto         - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
 "                   válaszok lesznek feltételezve\n"
 
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automatikusan kiválasztja a frissíthető csomagokat\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatikusan kiválasztja a frissíthető csomagokat\n"
 
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
 
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -181,45 +169,40 @@ msgstr ""
 "  --verify-rpm   - RPM-aláírás ellenőrzése telepítés előtt (kikapcsolás:\n"
 "                   --no-verify-rpm; alapértelmezés: bekapcsolt állapot)\n"
 
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - csak a felsorolt (elválasztás: vessző) adatforrások\n"
 "                   használata\n"
 
-#: ../gurpmi.pm:53
-#: ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - csomag keresése a szolgáltatásjegyzékben\n"
 
-#: ../gurpmi.pm:54
-#: ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
+msgstr ""
+"  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
 
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - másik gyökér használata az RPM-csomagtelepítéshez\n"
 
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
 msgstr "  --test         - csak ellenőrzés, hogy a telepítés végrehajtható-e\n"
 
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - csak a megadott adatforrások használata a kért csomagok\n"
 "                   kereséséhez\n"
@@ -229,12 +212,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Nincs megadva csomag"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Kis türelmet..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Rendszergazdai jogosultság szükséges"
@@ -265,107 +248,110 @@ msgstr ""
 "%s\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../gurpmi2:134
-#: ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (frissítés)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (telepítés)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Csomagválasztás"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "A következő csomagok valamelyikére szükség van:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Megszakítás"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
 "Continue installation anyway?"
 msgstr ""
-"A következő csomagokat el kell távolítani, hogy más csomagok frissíthetők legyenek:\n"
+"A következő csomagokat el kell távolítani, hogy más csomagok frissíthetők "
+"legyenek:\n"
 "%s\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../gurpmi2:240
-#: ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "A függőségek feloldásához a következő csomag telepítésre kerül:"
 
-#: ../gurpmi2:241
-#: ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "A függőségek feloldásához a következő csomagok telepítésre kerülnek:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d csomag, %d MB)"
 msgstr[1] "(%d csomag, %d MB)"
 
-#: ../gurpmi2:257
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
 
-#: ../gurpmi2:265
-#: ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Előkészítés..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
 
-#: ../gurpmi2:286
-#: ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Kérem helyezze be a(z) \"%s\" nevű adathordozót"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "A(z) '%s' csomag letöltése folyik..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...a behozatal sikertelen: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Kész"
 
-#: ../gurpmi2:331
-#: ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -376,33 +362,27 @@ msgstr ""
 "%s\n"
 "Érdemes lehet frissíteni az urpmi adatbázist."
 
-#: ../gurpmi2:337
-#: ../urpm/main_loop.pm:226
-#: ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262
-#: ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "A telepítés nem sikerült:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "A csomag(ok) már telepítve van(nak)"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "A telepítés befejeződött"
 
-#: ../gurpmi2:345
-#: ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "\"%s\" eltávolítása"
 
-#: ../gurpmi2:353
-#: ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "az urpmi újraindítása"
@@ -443,8 +423,7 @@ msgstr "                    alapértelmezés: %s\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - az RPM-csomag teljes nevének kiírása (NVRA)\n"
 
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
@@ -474,76 +453,62 @@ msgstr "Nem sikerült letölteni a csomagot a %s tükörről"
 msgid "Environment directory %s does not exist"
 msgstr "\"%s\" környezeti könyvtár nem létezik"
 
-#: ../urpm.pm:141
-#: ../urpmf:248
-#: ../urpmq:165
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "a következő környezet használata: %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "az rpmdb megnyitása nem sikerült"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "érvénytelen csomagfájlnév: \"%s\""
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-fájl behozatala: \"%s\"..."
 
-#: ../urpm.pm:327
-#: ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...behozatal megtörtént"
 
-#: ../urpm.pm:330
-#: ../urpm/download.pm:777
-#: ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830
-#: ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...a behozatal sikertelen: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "a csomagfájl nem elérhető: \"%s\""
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "nem sikerült elemezni a(z) \"%s\" specifikációs fájlt [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "az RPM-csomagfájl nem regisztrálható"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Az RPM-mel nem kompatibilis architektúra [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "hiba a helyi csomagok regisztrálásakor"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Korlátozott mód esetén ez a művelet nem végezhető el"
 
-#: ../urpm/args.pm:152
-#: ../urpm/args.pm:161
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "helytelen proxy-megadás a parancssorban\n"
@@ -576,48 +541,50 @@ msgstr "nincs a kifejezés lezárárva"
 #: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "alapértelmezésben az urpmi egy regexpet vár, ezt megerősítheti a \"--literal\" opcióval"
+msgstr ""
+"alapértelmezésben az urpmi egy regexpet vár, ezt megerősítheti a \"--literal"
+"\" opcióval"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-könyvtár nem létezik"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "\"%s\" nem használható \"%s\" nélkül"
 
-#: ../urpm/args.pm:497
-#: ../urpm/args.pm:500
-#: ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "\"%s\" nem használható ezzel: \"%s\""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Túl sok argumentum\n"
 
-#: ../urpm/bug_report.pm:54
-#: ../urpmi:259
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "A másolás sikertelen"
 
 #: ../urpm/cdrom.pm:66
 #, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Muszáj a CD-ROM-ot kézzel csatlakoztatnia (vagy telepítse a perl-Hal-Cdroms csomagot az automatikus csatlakoztatáshoz)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Muszáj a CD-ROM-ot kézzel csatlakoztatnia (vagy telepítse a perl-Hal-Cdroms "
+"csomagot az automatikus csatlakoztatáshoz)"
 
 #: ../urpm/cdrom.pm:68
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "A HAL démon (hald) nem fut vagy nem áll készen"
 
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "a(z) \"%s\" adatforrás nem elérhető"
@@ -642,9 +609,7 @@ msgstr "nem sikerült olvasni a(z) \"%s\" beállítási fájlt"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "\"%s\" adatforrás kétszer van megadva - megszakítás"
 
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:497
-#: ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "a beállítások mentése nem sikerült: \"%s\""
@@ -689,82 +654,87 @@ msgstr "a(z) %s hibát adott vissza: \"%d\" szignállal lépett ki"
 msgid "%s failed: exited with %d"
 msgstr "a(z) %s hibát adott vissza: \"%d\" kóddal lépett ki"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "a másolás sikertelen"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "a Wget hiányzik\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "a Curl hiányzik\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "a Curl hibát jelzett, a letöltés meg lett szakítva\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "az Rsync hiányzik\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "az SSH hiányzik\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "a Prozilla hiányzik\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Nem sikerült végrehajtani a Prozilla programot\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 hiányzik\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% megvan, összesen: %s, hátralevő: %s, sebesség: %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% megvan, sebesség: %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "\"%s\" behozatala"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "\"%s\" behozatala megtörtént"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ismeretlen protokoll van definiálva ehhez: \"%s\""
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nem található webes letöltő; a támogatott letöltők: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "protokollkezelés sikertelen: %s"
@@ -784,58 +754,60 @@ msgstr "a csomag nem található: \"%s\""
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM-fájlok behozatala a(z) \"%s\" adatforrásból..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[újracsomagolás]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, frissítés=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, "
+"frissítés=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "egy művelet elvégzése nem sikerült"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "nem sikerült kimásolni az RPM-csomagot a(z) \"%s\" delta-rpm csomagból"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "a(z) \"%s\" csomag telepítése sikertelen"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "hibás RPM-csomagok (%s) eltávolítása innen: %s"
 
-#: ../urpm/install.pm:212
-#: ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "%s eltávolítása sikertelen: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "A(z) %s csomag eltávolítása folyik"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "a(z) %s csomag eltávolítása folyik"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "a telepített RPM-csomagok (%s) eltávolítása innen: %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "További információ a(z) %s csomagról"
@@ -860,8 +832,7 @@ msgstr "Nincs megadva kiszolgáló - hiányzó URI vagy gépnév"
 msgid "No base defined"
 msgstr "Nincs megadva alap"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Nem lehet kapcsolódni az LDAP-URI-hoz:"
@@ -881,22 +852,23 @@ msgstr "leállítás"
 msgid "%s database is locked (another program is already using it)"
 msgstr "a(z) %s adatbázis zárolt (másik program már használja)"
 
-#: ../urpm/main_loop.pm:113
-#: ../urpm/main_loop.pm:123
-#: ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233
-#: ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "A telepítés nem sikerült"
 
-#: ../urpm/main_loop.pm:115
-#: ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Menjen mindenféleképp? (i/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -905,58 +877,57 @@ msgstr ""
 "A telepítés nem sikerült, hibás RPM-ek:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "A következő csomag helytelen aláírást tartalmaz:"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Szeretné folytatni a telepítést?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "telepített RPM-csomagok eltávolítása (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "%s elosztása"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s telepítése innen: %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s telepítése folyik"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Próbáljam meg a telepítést a függőségek ellenőrzése nélkül? (i/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Ha problémát okozhat, akkor is legyen telepítés (--force)? (i/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "A csomagok naprakészek"
 
-#: ../urpm/main_loop.pm:313
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "A telepítés elvégezhető"
@@ -969,7 +940,9 @@ msgstr "figyelmeztetés: a(z) %s ellenőrzőösszege nincs benne az MD5SUM fájl
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az adatforrás nem kerül feldolgozásra"
+msgstr ""
+"a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az "
+"adatforrás nem kerül feldolgozásra"
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -979,7 +952,8 @@ msgstr "\"%s\" listafájlja nem elérhető; az adatforrás nem kerül feldolgoz�
 #: ../urpm/media.pm:213
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
-msgstr "\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
+msgstr ""
+"\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
 
 #: ../urpm/media.pm:240
 #, c-format
@@ -989,10 +963,10 @@ msgstr "a(z) \"%s\" néven létező adatforrás elkerülése - kihagyás"
 #: ../urpm/media.pm:456
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
-msgstr "Sikertelen az eltávolítható eszköz csatlakoztatása. Az adatforrás kihagyva..."
+msgstr ""
+"Sikertelen az eltávolítható eszköz csatlakoztatása. Az adatforrás kihagyva..."
 
-#: ../urpm/media.pm:499
-#: ../urpm/media.pm:505
+#: ../urpm/media.pm:499 ../urpm/media.pm:505
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "beállítások mentése: \"%s\""
@@ -1009,8 +983,12 @@ msgstr "a hozzárendelt adatforrás használata párhuzamos módhoz: %s"
 
 #: ../urpm/media.pm:572
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, --update, --use-distrib, --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, "
+"--update, --use-distrib, --parallel"
 
 #: ../urpm/media.pm:666
 #, c-format
@@ -1112,7 +1090,8 @@ msgstr "a beállítások módosítása megtörtént"
 #: ../urpm/media.pm:1103
 #, c-format
 msgid "Error generating names file: dependency %d not found"
-msgstr "Nem sikerült elkészíteni a névfájlt - nem található a következő függőség: %d"
+msgstr ""
+"Nem sikerült elkészíteni a névfájlt - nem található a következő függőség: %d"
 
 #: ../urpm/media.pm:1124
 #, c-format
@@ -1127,17 +1106,15 @@ msgstr "kiterjesztett függőséglista vizsgálata: \"%s\""
 #: ../urpm/media.pm:1155
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
-msgstr "probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
+msgstr ""
+"probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
 
-#: ../urpm/media.pm:1168
-#: ../urpm/media.pm:1263
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "\"%s\" másolása a(z) \"%s\" adatforrás számára..."
 
-#: ../urpm/media.pm:1170
-#: ../urpm/media.pm:1240
-#: ../urpm/media.pm:1493
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
 #, c-format
 msgid "...copying failed"
 msgstr "...a másolás sikertelen"
@@ -1147,8 +1124,7 @@ msgstr "...a másolás sikertelen"
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" leírásfájljának másolása..."
 
-#: ../urpm/media.pm:1238
-#: ../urpm/media.pm:1267
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...másolás megtörtént"
@@ -1161,10 +1137,10 @@ msgstr "\"%s\" másolása sikertelen (a fájl túl kicsi)"
 #: ../urpm/media.pm:1317
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
-msgstr "a letöltött kiterjesztett függőséglista MD5-ös összegének kiszámítása folyik"
+msgstr ""
+"a letöltött kiterjesztett függőséglista MD5-ös összegének kiszámítása folyik"
 
-#: ../urpm/media.pm:1319
-#: ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "\"%s\" megszerzése sikertelen (az MD5-ös összegek nem egyeznek)"
@@ -1202,40 +1178,41 @@ msgstr "a(z) \"%s\" adatforrásnak nincs metaadat fájlja"
 #: ../urpm/media.pm:1475
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
-msgstr "\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) behozatala..."
+msgstr ""
+"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
+"behozatala..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" nyilvánoskulcs-fájljának vizsgálata..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%s kulcs importálva \"%s\" nyilvánoskulcs-fájljából"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" nyilvánoskulcs-fájlja nem importálható"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "a(z) \"%s\" adatforráshoz nem található kiterjesztett függőséglista"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "\"%s\" adatforrás frissítve"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] megszerzése sikertelen"
 
-#: ../urpm/mirrors.pm:19
-#: ../urpm/mirrors.pm:40
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
 #, c-format
 msgid "trying again with mirror %s"
 msgstr "Ismételt próbálkozás a %s tükörrel."
@@ -1245,107 +1222,113 @@ msgstr "Ismételt próbálkozás a %s tükörrel."
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Nem találok egy tükröt sem a %s tükörlistában."
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
-msgstr "%s %.2f %.2f földrajzi helyet állapítottam meg a(z) %s időzóna alapján."
+msgstr ""
+"%s %.2f %.2f földrajzi helyet állapítottam meg a(z) %s időzóna alapján."
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "tükörlista beolvasása innen: %s"
 
-#: ../urpm/msg.pm:63
-#: ../urpmi:502
-#: ../urpmi:517
-#: ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:553
-#: ../urpmi:648
-#: ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "IiyY"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (i/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Ezt nem lehet választani, próbálja meg újra\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Csomag"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Verzió"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Kiadás"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Architektúra"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(javasolt)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "\"%s\" adatforrás"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "parancssor"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "A következő csomag elárvult. Használd az \"urpme --auto-orphans\" parancsot az eltávolítására."
-msgstr[1] "A következő csomagok elárvultak. Használd az \"urpme --auto-orphans\" parancsot az eltávolításukra."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"A következő csomag elárvult. Használd az \"urpme --auto-orphans\" parancsot "
+"az eltávolítására."
+msgstr[1] ""
+"A következő csomagok elárvultak. Használd az \"urpme --auto-orphans\" "
+"parancsot az eltávolításukra."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1399,16 +1382,19 @@ msgstr "cp hiba a %s gépen (%d)"
 
 #: ../urpm/parallel_ssh.pm:86
 #, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "%s hiba a %s gépen (lehet, hogy az urpmi nem jó verziója található a gépen?)(kilépési kód: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s hiba a %s gépen (lehet, hogy az urpmi nem jó verziója található a gépen?)"
+"(kilépési kód: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "a(z) \"%s\" adatforrás nem hozzáférhető"
 
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "%s csatolása"
@@ -1418,13 +1404,310 @@ msgstr "%s csatolása"
 msgid "unmounting %s"
 msgstr "%s leválasztása"
 
-#: ../urpm/search.pm:29
+#: ../urpm/select.pm:30
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"az Urpmi újra lett indítva; a prioritásos csomagok listája nem változott"
+
+#: ../urpm/select.pm:32
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"az Urpmi újra lett indítva; a prioritásos csomagok listája változott: %s  -  "
+"%s"
+
+#: ../urpm/select.pm:170
+#, c-format
+msgid "No package named %s"
+msgstr "Nincs ilyen nevű csomag: %s"
+
+#: ../urpm/select.pm:172 ../urpme:117
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
+
+#: ../urpm/select.pm:174
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr "Használja a \"-a\" kapcsolót minden kijelöléséhez"
+
+#: ../urpm/select.pm:294
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "%s csomagot talált az urpmi db-ben, de ezek nem telepíthetőek"
+
+#: ../urpm/select.pm:537
+#, c-format
+msgid "Package %s is already installed"
+msgstr "A(z) \"%s\" csomag már telepítve van"
+
+#: ../urpm/select.pm:538
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "A(z) \"%s\" csomagok már telepítve vannak"
+
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#, c-format
+msgid "due to missing %s"
+msgstr "\"%s\" hiánya miatt"
+
+#: ../urpm/select.pm:557
+#, c-format
+msgid "due to already installed %s"
+msgstr "mivel \"%s\" már telepítve van"
+
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "\"%s\" igényei miatt"
+
+#: ../urpm/select.pm:564
+#, c-format
+msgid "trying to promote %s"
+msgstr "a legalkalmasabb \"%s\" keresése"
+
+#: ../urpm/select.pm:565
+#, c-format
+msgid "in order to keep %s"
+msgstr "\"%s\" megtartása érdekében"
+
+#: ../urpm/select.pm:606
+#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"A következő csomagot el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
+"%s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"A következő csomagokat el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
+"%s"
+
+#: ../urpm/select.pm:634
+#, c-format
+msgid "in order to install %s"
+msgstr "\"%s\" telepítése érdekében"
+
+#: ../urpm/select.pm:644
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "ezzel való ütközés miatt: \"%s\""
+
+#: ../urpm/signature.pm:32
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Érvénytelen elektronikus aláírás (%s)"
+
+#: ../urpm/signature.pm:63
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Érvénytelen kulcsazonosító (%s)"
+
+#: ../urpm/signature.pm:65
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Hiányzó elektronikus aláírás (%s)"
+
+#: ../urpm/sys.pm:178
+#, c-format
+msgid "system"
+msgstr "rendszer"
+
+#: ../urpm/sys.pm:213
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "A(z) %s újraindítása szükséges a(z) %s számára"
+
+#: ../urpm/sys.pm:316
+#, c-format
+msgid "Can't write file"
+msgstr "A fájl nem írható"
+
+#: ../urpm/sys.pm:316
+#, c-format
+msgid "Can't open file"
+msgstr "Nem sikerült megnyitni a fájlt"
+
+#: ../urpm/sys.pm:329
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "%s nem mozgatható ide: %s"
+
+#: ../urpme:41
+#, 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"
+msgstr ""
+"urpme %s\n"
+"Copyright (C) Mandriva, 1999-2008.\n"
+"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
+"\n"
+"Használat:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - választási lehetőségnél automatikusan választ csomagot\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - árvák eltávolítása\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - elosztott urpmi több számítógép közt\n"
+
+#: ../urpme:52 ../urpmi:142
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - a fájlok újracsomagolása törlés előtt\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --root         - másik gyökér használata az RPM-csomageltávolításhoz\n"
+
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - másik gyökér használata az Urpmi-adatbázishoz és az\n"
+"                   RPM-csomagtelepítéshez\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - csak az RPM-adatbázis legyen frissítve, a fájlrendszer "
+"ne\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - a csomagok szkriptjei ne legyenek végrehajtva\n"
+
+#: ../urpme:57
+#, 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"
+msgstr ""
+"  --use-distrib  - az urpme menet közben való beállítása egy disztribúciós\n"
+"                   fából - például chroot telepítéséhez/eltávolításához\n"
+"                   használható a --root opció esetén\n"
+
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - részletes információ\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - a mintára illeszkedő csomagok kijelölése\n"
+
+#: ../urpme:75
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Csomagok eltávolításához rendszergazdai jogosultság szükséges"
+
+#: ../urpme:108
+#, c-format
+msgid "unknown packages"
+msgstr "ismeretlen csomagok"
+
+#: ../urpme:108
+#, c-format
+msgid "unknown package"
+msgstr "ismeretlen csomag"
+
+#: ../urpme:123
+#, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Az alábbi csomag eltávolítása tönkreteheti a rendszert:"
+msgstr[1] "Az alábbi csomagok eltávolítása tönkreteheti a rendszert:"
+
+#: ../urpme:128
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nincs mit eltávolítani"
+
+#: ../urpme:145
+#, c-format
+msgid "No orphans to remove"
+msgstr "Nincs árva csomag."
+
+#: ../urpme:151
+#, 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] "A függőségek feloldásához a következő csomag el lesz távolítva"
+msgstr[1] "A függőségek feloldásához a következő %d csomag el lesz távolítva"
+
+#: ../urpme:156
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "(árva csomag)"
+msgstr[1] "(árva csomagok)"
+
+#: ../urpme:163
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%d csomag eltávolítása?"
+msgstr[1] "%d csomag eltávolítása?"
+
+#: ../urpme:168
+#, c-format
+msgid "testing removal of %s"
+msgstr "%s eltávolításának tesztelése"
+
+#: ../urpme:185
+#, c-format
+msgid "Removal failed"
+msgstr "Az eltávolítás sikertelen"
+
+#: ../urpme:187
+#, c-format
+msgid "Removal is possible"
+msgstr "Az eltávolítás elvégezhető"
+
 #: ../urpmf:29
 #, 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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
@@ -1434,660 +1717,296 @@ msgstr ""
 "\n"
 "Használat: urpmf [opciók] mintakifejezés\n"
 
-#: ../urpm/search.pm:36
 #: ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - jelen program verziószámának megjelenítése\n"
 
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - megadott környezet használata (általában hibajelentés\n"
 "                   esetén használatos)\n"
 
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - a felsorolt (elválasztás: vessző) adatforrások\n"
 "                   feldolgozásának mellőzése\n"
 
-#: ../urpm/search.pm:39
 #: ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
-"  --literal, -l  - mintaillesztés mellőzése, az argumentum normál szövegként\n"
+"  --literal, -l  - mintaillesztés mellőzése, az argumentum normál "
+"szövegként\n"
 "                   való kezelése\n"
 
-#: ../urpm/search.pm:40
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:72
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:70
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - másik gyökér használata az Urpmi-adatbázishoz és az\n"
-"                   RPM-csomagtelepítéshez\n"
-
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - az adatforrások sorbarendezése vesszővel elválasztott\n"
 "                   sztringek alapján\n"
 
-#: ../urpm/search.pm:43
 #: ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - a megadott útvonal használata az adatforrások eléréséhez\n"
+msgstr ""
+"  --use-distrib  - a megadott útvonal használata az adatforrások eléréséhez\n"
 
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - a megadott kiterjesztett függőséglista használata az\n"
 "                   urpmi-adatbázis helyett\n"
 
-#: ../urpm/search.pm:45
 #: ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - az azonos sorok csak egyszer jelenjenek meg\n"
 
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - csak frissítési adatforrás legyen használva\n"
 
-#: ../urpm/search.pm:47
 #: ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - részletes információ\n"
 
-#: ../urpm/search.pm:48
 #: ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - a minták feldolgozása nem nagybetűérzékeny\n"
 
-#: ../urpm/search.pm:49
 #: ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - a minták feldolgozása nagybetűérzékeny (alapértelmezés)\n"
+msgstr ""
+"  -I             - a minták feldolgozása nagybetűérzékeny (alapértelmezés)\n"
 
-#: ../urpm/search.pm:50
 #: ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<szöveg>     - mezőelválasztó módosítása (alapértelmezés: \":\")\n"
 
-#: ../urpm/search.pm:51
 #: ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mintakifejezések:\n"
 
-#: ../urpm/search.pm:52
 #: ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
-"  szöveg         - a szövegek reguláris kifejezésként vannak kezelve, ezt -l\n"
+"  szöveg         - a szövegek reguláris kifejezésként vannak kezelve, ezt -"
+"l\n"
 "                   opcióval lehet felülbírálni\n"
 
-#: ../urpm/search.pm:53
 #: ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - Perl kód közvetlen betevése (perl -e)\n"
 
-#: ../urpm/search.pm:54
 #: ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - bináris ÉS művelet.\n"
 
-#: ../urpm/search.pm:55
 #: ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - bináris VAGY művelet.\n"
 
-#: ../urpm/search.pm:56
 #: ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unáris NEM művelet.\n"
 
-#: ../urpm/search.pm:57
 #: ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - bal illetve jobb oldali zárójel\n"
 
-#: ../urpm/search.pm:58
 #: ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Címkék listája:\n"
 
-#: ../urpm/search.pm:59
 #: ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - printf-szerű kiírási formátum megadása\n"
 
-#: ../urpm/search.pm:60
 #: ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   példa: '%%name:%%files'\n"
 
-#: ../urpm/search.pm:61
 #: ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - architektúra\n"
 
-#: ../urpm/search.pm:62
 #: ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - a csomagkészítéshez használt gép\n"
 
-#: ../urpm/search.pm:63
 #: ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - a csomagkészítés időpontja\n"
 
-#: ../urpm/search.pm:64
 #: ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - beállítási fájlok\n"
 
-#: ../urpm/search.pm:65
 #: ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - \"ütközés\" címkék\n"
 
-#: ../urpm/search.pm:66
 #: ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - csomagleírás\n"
 
-#: ../urpm/search.pm:67
 #: ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - disztribúció\n"
 
-#: ../urpm/search.pm:68
 #: ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - generáció\n"
 
-#: ../urpm/search.pm:69
 #: ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - a csomag fájlneve\n"
 
-#: ../urpm/search.pm:70
 #: ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - a csomagban levő fájlok listája\n"
 
-#: ../urpm/search.pm:71
 #: ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - csoport\n"
 
-#: ../urpm/search.pm:72
 #: ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - licenc\n"
 
-#: ../urpm/search.pm:73
 #: ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - csomagnév\n"
 
-#: ../urpm/search.pm:74
 #: ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - \"elavulttá tesz\" címkék\n"
 
-#: ../urpm/search.pm:75
 #: ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - csomagkészítő\n"
 
-#: ../urpm/search.pm:76
 #: ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - \"szolgáltatásjegyzék\" címkék\n"
 
-#: ../urpm/search.pm:77
 #: ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - \"követelmények\" címkék\n"
 
-#: ../urpm/search.pm:78
 #: ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - telepített méret\n"
 
-#: ../urpm/search.pm:79
 #: ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - a forráscsomag neve\n"
 
-#: ../urpm/search.pm:80
 #: ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - \"javasol\" címkék\n"
 
-#: ../urpm/search.pm:81
 #: ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - összefoglaló\n"
 
-#: ../urpm/search.pm:82
 #: ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpm/search.pm:83
 #: ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - terjesztő\n"
 
-#: ../urpm/search.pm:84
 #: ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - a csomagot tartalmazó adatforrás\n"
 
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:99
+#: ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - a névvel együtt a verzió, a kiadásszám és az\n"
 "                   architektúra is jelenjen meg\n"
 
-#: ../urpm/search.pm:197
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "befejezetlen kifejezés (%s)"
+
 #: ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Helytelen formátum: csak egy darab többértékű címke használható"
 
-#: ../urpm/search.pm:290
 #: ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "a(z) \"%s\" adatforráshoz nem elérhető a fejléclista (hdlist)"
 
-#: ../urpm/search.pm:297
 #: ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "a \"%s\" adatforrás kiterjesztett függőséglistája nem elérhető"
 
-#: ../urpm/search.pm:304
 #: ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "a(z) \"%s\" adatforrás listafájlja nem elérhető"
 
-#: ../urpm/select.pm:30
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "az Urpmi újra lett indítva; a prioritásos csomagok listája nem változott"
-
-#: ../urpm/select.pm:32
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "az Urpmi újra lett indítva; a prioritásos csomagok listája változott: %s  -  %s"
-
-#: ../urpm/select.pm:170
-#, c-format
-msgid "No package named %s"
-msgstr "Nincs ilyen nevű csomag: %s"
-
-#: ../urpm/select.pm:172
-#: ../urpme:115
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
-
-#: ../urpm/select.pm:174
-#, c-format
-msgid "You should use \"-a\" to use all of them"
-msgstr "Használja a \"-a\" kapcsolót minden kijelöléséhez"
-
-#: ../urpm/select.pm:295
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "%s csomagot talált az urpmi db-ben, de ezek nem telepíthetőek"
-
-#: ../urpm/select.pm:538
-#, c-format
-msgid "Package %s is already installed"
-msgstr "A(z) \"%s\" csomag már telepítve van"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "A(z) \"%s\" csomagok már telepítve vannak"
-
-#: ../urpm/select.pm:557
-#: ../urpm/select.pm:641
-#, c-format
-msgid "due to missing %s"
-msgstr "\"%s\" hiánya miatt"
-
-#: ../urpm/select.pm:558
-#, c-format
-msgid "due to already installed %s"
-msgstr "mivel \"%s\" már telepítve van"
-
-#: ../urpm/select.pm:559
-#: ../urpm/select.pm:639
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "\"%s\" igényei miatt"
-
-#: ../urpm/select.pm:565
-#, c-format
-msgid "trying to promote %s"
-msgstr "a legalkalmasabb \"%s\" keresése"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "in order to keep %s"
-msgstr "\"%s\" megtartása érdekében"
-
-#: ../urpm/select.pm:607
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"A következő csomagot el kell távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
-"%s"
-
-#: ../urpm/select.pm:608
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"A következő csomagokat el kell távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
-"%s"
-
-#: ../urpm/select.pm:635
-#, c-format
-msgid "in order to install %s"
-msgstr "\"%s\" telepítése érdekében"
-
-#: ../urpm/select.pm:645
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "ezzel való ütközés miatt: \"%s\""
-
-#: ../urpm/signature.pm:32
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Érvénytelen elektronikus aláírás (%s)"
-
-#: ../urpm/signature.pm:63
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Érvénytelen kulcsazonosító (%s)"
-
-#: ../urpm/signature.pm:65
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Hiányzó elektronikus aláírás (%s)"
-
-#: ../urpm/sys.pm:178
-#, c-format
-msgid "system"
-msgstr "rendszer"
-
-#: ../urpm/sys.pm:213
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "A(z) %s újraindítása szükséges a(z) %s számára"
-
-#: ../urpm/sys.pm:316
-#, c-format
-msgid "Can't write file"
-msgstr "A fájl nem írható"
-
-#: ../urpm/sys.pm:316
-#, c-format
-msgid "Can't open file"
-msgstr "Nem sikerült megnyitni a fájlt"
-
-#: ../urpm/sys.pm:329
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "%s nem mozgatható ide: %s"
-
-#: ../urpme:41
-#, 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"
-msgstr ""
-"urpme %s\n"
-"Copyright (C) Mandriva, 1999-2008.\n"
-"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
-"\n"
-"Használat:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - választási lehetőségnél automatikusan választ csomagot\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - árvák eltávolítása\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\n"
-
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - elosztott urpmi több számítógép közt\n"
-
-#: ../urpme:52
-#: ../urpmi:142
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - a fájlok újracsomagolása törlés előtt\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - másik gyökér használata az RPM-csomageltávolításhoz\n"
-
-#: ../urpme:55
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - csak az RPM-adatbázis legyen frissítve, a fájlrendszer ne\n"
-
-#: ../urpme:56
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - a csomagok szkriptjei ne legyenek végrehajtva\n"
-
-#: ../urpme:57
-#, 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"
-msgstr ""
-"  --use-distrib  - az urpme menet közben való beállítása egy disztribúciós\n"
-"                   fából - például chroot telepítéséhez/eltávolításához\n"
-"                   használható a --root opció esetén\n"
-
-#: ../urpme:59
-#: ../urpmi:153
-#: ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - részletes információ\n"
-
-#: ../urpme:60
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - a mintára illeszkedő csomagok kijelölése\n"
-
-#: ../urpme:73
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Csomagok eltávolításához rendszergazdai jogosultság szükséges"
-
-#: ../urpme:106
-#, c-format
-msgid "unknown packages"
-msgstr "ismeretlen csomagok"
-
-#: ../urpme:106
-#, c-format
-msgid "unknown package"
-msgstr "ismeretlen csomag"
-
-#: ../urpme:121
-#, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Az alábbi csomag eltávolítása tönkreteheti a rendszert:"
-msgstr[1] "Az alábbi csomagok eltávolítása tönkreteheti a rendszert:"
-
-#: ../urpme:126
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nincs mit eltávolítani"
-
-#: ../urpme:143
-#, c-format
-msgid "No orphans to remove"
-msgstr "Nincs árva csomag."
-
-#: ../urpme:149
-#, 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] "A függőségek feloldásához a következő csomag el lesz távolítva"
-msgstr[1] "A függőségek feloldásához a következő %d csomag el lesz távolítva"
-
-#: ../urpme:154
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "(árva csomag)"
-msgstr[1] "(árva csomagok)"
-
-#: ../urpme:161
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%d csomag eltávolítása?"
-msgstr[1] "%d csomag eltávolítása?"
-
-#: ../urpme:161
-#: ../urpmi:554
-#: ../urpmi:649
-#: ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (i/N) "
-
-#: ../urpme:166
-#, c-format
-msgid "testing removal of %s"
-msgstr "%s eltávolításának tesztelése"
-
-#: ../urpme:181
-#, c-format
-msgid "Removal failed"
-msgstr "Az eltávolítás sikertelen"
-
-#: ../urpme:183
-#, c-format
-msgid "Removal is possible"
-msgstr "Az eltávolítás elvégezhető"
-
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "befejezetlen kifejezés (%s)"
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
-msgstr "  --auto-update  - adatforrások frissítése, majd a rendszer frissítése\n"
+msgstr ""
+"  --auto-update  - adatforrások frissítése, majd a rendszer frissítése\n"
 
 #: ../urpmi:82
 #, c-format
@@ -2104,17 +2023,21 @@ msgstr "    --force-key    - a GPG-kulcs frissítésének kikényszerítése\n"
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - kérdés nélkül eltávolítja az árva csomagokat\n"
 
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
-msgstr "  --suggests     - ne legyenek automatikusan kijelölve a \"javasolt\" csomagok.\n"
+msgstr ""
+"  --suggests     - ne legyenek automatikusan kijelölve a \"javasolt\" "
+"csomagok.\n"
 
 #: ../urpmi:86
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
-"  --no-uninstall - a program soha ne ajánlja fel csomag eltávolítását, inkább\n"
+"  --no-uninstall - a program soha ne ajánlja fel csomag eltávolítását, "
+"inkább\n"
 "                   szakadjon félbe a telepítés\n"
 
 #: ../urpmi:87
@@ -2122,8 +2045,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - csomagok telepítésének mellőzése (csak letöltés)\n"
 
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2139,14 +2061,17 @@ msgid ""
 "                   are going to be installed or upgraded,\n"
 "                   default is %d.\n"
 msgstr ""
-"  --split-level  - a műveletek több részre bontása a megadottnál több csomag\n"
+"  --split-level  - a műveletek több részre bontása a megadottnál több "
+"csomag\n"
 "                   telepítése vagy frissítése esetén,\n"
 "                   az alapértelmezés szerinti érték: %d\n"
 
 #: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - csökkentett művelethossz használata, az alapértelmezés: %d\n"
+msgstr ""
+"  --split-length - csökkentett művelethossz használata, az alapértelmezés: %"
+"d\n"
 
 #: ../urpmi:96
 #, c-format
@@ -2161,12 +2086,14 @@ msgstr "  --buildrequires     - csomagkövetelmények telepítése\n"
 #: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - csak a forráscsomag telepítése (a programok mellőzése)\n"
+msgstr ""
+"  --install-src  - csak a forráscsomag telepítése (a programok mellőzése)\n"
 
 #: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - RPM-fájl eltávolítása a gyorstárból a műveletek előtt\n"
+msgstr ""
+"  --clean        - RPM-fájl eltávolítása a gyorstárból a műveletek előtt\n"
 
 #: ../urpmi:100
 #, c-format
@@ -2175,8 +2102,10 @@ msgstr "  --noclean      - az RPM-fájlok ne törlődjenek a gyorstárból\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - a már telepített csomagok telepítésének kikényszerítése\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - a már telepített csomagok telepítésének kikényszerítése\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2185,7 +2114,8 @@ msgid ""
 "                   dependencies checking.\n"
 msgstr ""
 "  --allow-nodeps - lehetővé teszi a csomagok függőségellenőrzés nélküli\n"
-"                   telepítését (a felhasználótól érkező megerősítést követően)\n"
+"                   telepítését (a felhasználótól érkező megerősítést "
+"követően)\n"
 
 #: ../urpmi:106
 #, c-format
@@ -2193,8 +2123,10 @@ msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
-"  --allow-force  - lehetővé teszi a csomagok függőség- és helyességellenőrzés\n"
-"                   nélküli telepítését (a felhasználótól érkező megerősítést\n"
+"  --allow-force  - lehetővé teszi a csomagok függőség- és "
+"helyességellenőrzés\n"
+"                   nélküli telepítését (a felhasználótól érkező "
+"megerősítést\n"
 "                   követően)\n"
 
 #: ../urpmi:108
@@ -2209,15 +2141,15 @@ msgid ""
 "                   to install a chroot with --root option.\n"
 msgstr ""
 "  --use-distrib  - az urpmi menet közben való beállítása egy disztribúciós\n"
-"                   fából - például chroot telepítéséhez használható a --root\n"
+"                   fából - például chroot telepítéséhez használható a --"
+"root\n"
 "                   opció esetén\n"
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
-msgstr "  --metalink     - Egy helyi metalink-et legenerál, és azt használja.\n"
+msgstr ""
+"  --metalink     - Egy helyi metalink-et legenerál, és azt használja.\n"
 
 #: ../urpmi:115
 #, c-format
@@ -2253,9 +2185,7 @@ msgstr "  --prozilla-options - további opciók a Prozilla program számára\n"
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - további opciók az aria2 program számára\n"
 
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - a letöltési sebesség korlátozása\n"
@@ -2267,24 +2197,20 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 "  --resume       - részlegesen letöltött fájlok átvitelének folytatása\n"
-"                   (a --no-resume kikapcsolja; alapértelmezésben kikapcsolt)\n"
+"                   (a --no-resume kikapcsolja; alapértelmezésben "
+"kikapcsolt)\n"
 
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --proxy        - a megadott HTTP proxy használata; a portszám alapértelmezés\n"
+"  --proxy        - a megadott HTTP proxy használata; a portszám "
+"alapértelmezés\n"
 "                   szerint 1080 (formátum: <proxygép[:port]>)\n"
 
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2305,7 +2231,8 @@ msgstr ""
 #: ../urpmi:136
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
+msgstr ""
+"  --excludepath  - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
 
 #: ../urpmi:137
 #, c-format
@@ -2315,13 +2242,15 @@ msgstr "  --excludedocs  - dokumentációs fájlok kihagyása\n"
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - telepítés előtt ne legyen ellenőrizve az üres lemezhely\n"
+msgstr ""
+"  --ignoresize   - telepítés előtt ne legyen ellenőrizve az üres lemezhely\n"
 
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
-"  --ignorearch   - az RPM-csomagok telepítésének engedélyezése nem megfelelő\n"
+"  --ignorearch   - az RPM-csomagok telepítésének engedélyezése nem "
+"megfelelő\n"
 "                   architektúra esetén is\n"
 
 #: ../urpmi:140
@@ -2350,7 +2279,8 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --more-choices - ha nagyobb mennyiségű csomagot talált a rendszer, akkor az\n"
+"  --more-choices - ha nagyobb mennyiségű csomagot talált a rendszer, akkor "
+"az\n"
 "                   alapértelmezettnél több lehetőséget kínáljon fel\n"
 
 #: ../urpmi:147
@@ -2363,8 +2293,7 @@ msgstr "  --nolock       - ne legyen zárolva az RPM-adatbázis\n"
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - csak az azonos architektúrájú csomagok frissítése\n"
 
-#: ../urpmi:149
-#: ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - kijelölés a parancssorban megadott minta szerint\n"
@@ -2382,7 +2311,8 @@ msgstr "  --debug        - nagyon részletes információ.\n"
 #: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  a parancssorban megadott csomagok illetve RPM-fájlok lesznek telepítve\n"
+msgstr ""
+"  a parancssorban megadott csomagok illetve RPM-fájlok lesznek telepítve\n"
 
 #: ../urpmi:183
 #, c-format
@@ -2395,7 +2325,8 @@ msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
-"Hiba: hibajelentés készítéséhez adja meg a szokásos parancssori argumentumokat\n"
+"Hiba: hibajelentés készítéséhez adja meg a szokásos parancssori "
+"argumentumokat\n"
 "a --bug opcióval együtt.\n"
 
 #: ../urpmi:220
@@ -2415,18 +2346,27 @@ msgstr "alapértelmezésben --buildrequires"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "használja a --buildrequires vagy --install-src opciót, alapértelmezés: --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"használja a --buildrequires vagy --install-src opciót, alapértelmezés: --"
+"buildrequires"
 
 #: ../urpmi:253
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "\"%s\" nevű könyvtár már létezik. Használjon más könyvtárt a hibajelentéshez, vagy pedig törölje."
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"\"%s\" nevű könyvtár már létezik. Használjon más könyvtárt a "
+"hibajelentéshez, vagy pedig törölje."
 
 #: ../urpmi:254
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
-msgstr "A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: \"%s\""
+msgstr ""
+"A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: "
+"\"%s\""
 
 #: ../urpmi:275
 #, c-format
@@ -2437,46 +2377,44 @@ msgstr ""
 "Hiba: úgy tűnik, hogy \"%s\" csak olvasható módon lett csatolva.\n"
 "Ha mégis végre kívánja hajtani a műveletet, használja a --allow-force opciót."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Adatforrás frissítése...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (frissítés)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (frissítés)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (telepítés)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (telepítés)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "A(z) \"%s\" függőség feloldásához szükség van a következő csomagok egyikére:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"A(z) \"%s\" függőség feloldásához szükség van a következő csomagok egyikére:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Melyiket választja? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2487,7 +2425,7 @@ msgstr ""
 "amelyek régebbiek a telepítetteknél:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2498,8 +2436,7 @@ msgstr ""
 "amelyek régebbiek a telepítetteknél:\n"
 "%s"
 
-#: ../urpmi:503
-#: ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2508,15 +2445,12 @@ msgstr ""
 "\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../urpmi:504
-#: ../urpmi:519
-#: ../urpmi:613
-#: ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (I/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2525,7 +2459,7 @@ msgstr ""
 "A következő kért csomagot nem lehet telepíteni:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2534,12 +2468,12 @@ msgstr ""
 "A kért csomagok közül néhányat nem lehet telepíteni:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "a(z) \"%s\" csomag eltávolítása tönkreteheti a rendszert"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2550,7 +2484,7 @@ msgstr ""
 "távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2561,60 +2495,62 @@ msgstr ""
 "távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(csak teszt; az eltávolítás nem lesz ténylegesen végrehajtva)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
-"Használja az urpmi-hoz a --buildrequires opciót az alábbi függőségek telepítéséhez:\n"
+"Használja az urpmi-hoz a --buildrequires opciót az alábbi függőségek "
+"telepítéséhez:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Az következő árva csomag el lesz távolítva."
 msgstr[1] "Az következő árva csomagok el lesznek távolítva."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(csak teszt; a telepítés nem lesz ténylegesen végrehajtva)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "További %s lemezhely lesz használva."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s lemezhely fel lesz szabadítva."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s csomag lesz beszerezve."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Kívánja folytatni a csomag telepítését?"
 msgstr[1] "Kívánja folytatni a(z) %d csomag telepítését?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Amikor csatolta, nyomja le az Enter billentyűt..."
@@ -2652,7 +2588,8 @@ msgstr ""
 "       cdrom://<elérési út>\n"
 "\n"
 "használat: urpmi.addmedia [opciók] --distrib --mirrorlist <url>\n"
-"használat: urpmi.addmedia [opciók] --mirrorlist <url> <név> <relatív elérési út>\n"
+"használat: urpmi.addmedia [opciók] --mirrorlist <url> <név> <relatív elérési "
+"út>\n"
 "\n"
 "például:\n"
 "\n"
@@ -2662,29 +2599,22 @@ msgstr ""
 "\n"
 "az [opciók] pedig a következők lehetnek:\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - a Wget használata távoli fájlok letöltésére\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - a Curl használata távoli fájlok letöltésére\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - a Prozilla használata távoli fájlok letöltésére\n"
 
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --aria2         - az Aria2 használata távoli fájlok letöltésére\n"
@@ -2703,10 +2633,12 @@ msgstr ""
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
 "  --xml-info     - egyedi irányelv a listafájlok letöltéséhez:\n"
-"                   never, on-demand, update-only, always. Lásd: urpmi.cfg(5)\n"
+"                   never, on-demand, update-only, always. Lásd: urpmi.cfg"
+"(5)\n"
 
 #: ../urpmi.addmedia:69
 #, c-format
@@ -2728,17 +2660,22 @@ msgstr "  --no-probe     - fejléclista keresésének mellőzése\n"
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
-msgstr "  --distrib      - az összes adatforrás létrehozása telepítési adatforrásból\n"
+msgstr ""
+"  --distrib      - az összes adatforrás létrehozása telepítési "
+"adatforrásból\n"
 
 #: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  - --distrib esetén: megerősítés kérése minden adatforráshoz\n"
+msgstr ""
+"  --interactive  - --distrib esetén: megerősítés kérése minden "
+"adatforráshoz\n"
 
 #: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
-msgstr "  --all-media    - --distrib esetén: minden listázott adatforrás felvétele\n"
+msgstr ""
+"  --all-media    - --distrib esetén: minden listázott adatforrás felvétele\n"
 
 #: ../urpmi.addmedia:77
 #, c-format
@@ -2753,10 +2690,10 @@ msgstr ""
 #: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
-msgstr "  --virtual      - virtuális, mindig naprakész adatforrás létrehozása.\n"
+msgstr ""
+"  --virtual      - virtuális, mindig naprakész adatforrás létrehozása.\n"
 
-#: ../urpmi.addmedia:80
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
@@ -2764,23 +2701,22 @@ msgstr "  --no-md5sum    - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
 #: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
-msgstr "  --nopubkey     - a felvett adatforrás publikus kulcsa ne legyen importálva\n"
+msgstr ""
+"  --nopubkey     - a felvett adatforrás publikus kulcsa ne legyen "
+"importálva\n"
 
 #: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - az adatforrás felvétele, de a frissítésének mellőzése\n"
+msgstr ""
+"  --raw          - az adatforrás felvétele, de a frissítésének mellőzése\n"
 
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - néma üzemmód\n"
 
-#: ../urpmi.addmedia:84
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - részletes információ\n"
@@ -2798,7 +2734,8 @@ msgstr "Hiányzik az argumentum: --distrib --mirrorlist <url>"
 #: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "helytelen <url> (helyi könyvtár esetén az útvonalnak abszolútnak kell lennie)"
+msgstr ""
+"helytelen <url> (helyi könyvtár esetén az útvonalnak abszolútnak kell lennie)"
 
 #: ../urpmi.addmedia:124
 #, c-format
@@ -2849,7 +2786,8 @@ msgstr "az adatforrás nem hozzáadható"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2873,7 +2811,8 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - tranzakciók listázása a megadott dátum/időtartam\n"
 "                   argumentumtól kezdődően\n"
@@ -2881,7 +2820,8 @@ msgstr ""
 #: ../urpmi.recover:38
 #, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - az RPM-adatbázisban levő tranzakciók listázása (hosszú)\n"
+msgstr ""
+"  --list-all     - az RPM-adatbázisban levő tranzakciók listázása (hosszú)\n"
 
 #: ../urpmi.recover:39
 #, c-format
@@ -2966,8 +2906,7 @@ msgstr "Nem található ez utáni tranzakció: %s\n"
 msgid "You must be superuser to do this"
 msgstr "Ehhez rendszergazdai jogosultság szükséges"
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "RPM-makrófájl írása [%s]...\n"
@@ -3014,7 +2953,9 @@ msgstr "Adatforrás eltávolításához rendszergazdai jogosultság szükséges"
 #: ../urpmi.removemedia:72
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás felvételéhez)\n"
+msgstr ""
+"nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
 
 #: ../urpmi.removemedia:78
 #, c-format
@@ -3047,12 +2988,16 @@ msgstr "  --force-key    - a GPG-kulcs frissítésének kikényszerítése\n"
 #: ../urpmi.update:46
 #, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
-msgstr "  --ignore       - ne legyen frissítés; az adatforrások kihagyottnak jelölése\n"
+msgstr ""
+"  --ignore       - ne legyen frissítés; az adatforrások kihagyottnak "
+"jelölése\n"
 
 #: ../urpmi.update:47
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr "  --no-ignore    - ne legyen frissítés; az adatforrások bekapcsoltnak jelölése\n"
+msgstr ""
+"  --no-ignore    - ne legyen frissítés; az adatforrások bekapcsoltnak "
+"jelölése\n"
 
 #: ../urpmi.update:49
 #, c-format
@@ -3074,19 +3019,22 @@ msgstr "  -f             - fejléclista frissítésének kikényszerítése\n"
 #: ../urpmi.update:52
 #, c-format
 msgid "  -ff            - really force updating synthesis\n"
-msgstr "  -ff            - fejléclista frissítésének kikényszerítése (mindenképpen)\n"
+msgstr ""
+"  -ff            - fejléclista frissítésének kikényszerítése (mindenképpen)\n"
 
 #: ../urpmi.update:69
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Adatforrás frissítéséhez rendszergazdai jogosultság szükséges"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás felvételéhez)\n"
+msgstr ""
+"nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3095,17 +3043,17 @@ msgstr ""
 "a frissítendő bejegyzés hiányzik\n"
 "(valamelyik ezek közül: %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" adatforrás kihagyása"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "\"%s\" adatforrás bekapcsolása"
@@ -3115,7 +3063,8 @@ msgstr "\"%s\" adatforrás bekapcsolása"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -3127,7 +3076,9 @@ msgstr ""
 
 #: ../urpmq:48
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr ""
 "  --searchmedia  - csak a megadott adatforrások használata a kért (vagy\n"
 "                   frissített) csomagok kereséséhez\n"
@@ -3160,7 +3111,8 @@ msgstr "  --list-url     - elérhető adatforrások és URL-jeik listázása\n"
 #: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - az elérhető gépek listázása --parallel használata esetén\n"
+msgstr ""
+"  --list-nodes   - az elérhető gépek listázása --parallel használata esetén\n"
 
 #: ../urpmq:62
 #, c-format
@@ -3169,17 +3121,22 @@ msgstr "  --list-aliases - az elérhető párhuzamos aliasok listázása\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - beállítások kiírása urpmi.addmedia-argumentumok formájában\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - beállítások kiírása urpmi.addmedia-argumentumok "
+"formájában\n"
 
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
+msgstr ""
+"  --src          - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - a csomagok elérési útjának listázása letöltés előtt\n"
 "                   (rendszergazdai jogosultság szükséges)\n"
@@ -3188,7 +3145,8 @@ msgstr ""
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
-"  --ignorearch   - a nem megfelelő architektúrájú RPM-csomagok lekérdezésének\n"
+"  --ignorearch   - a nem megfelelő architektúrájú RPM-csomagok "
+"lekérdezésének\n"
 "                   engedélyezése\n"
 
 #: ../urpmq:71
@@ -3261,7 +3219,8 @@ msgid ""
 "                   - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  --whatrequires-recursive\n"
-"                   - kiterjesztett fordított keresés (virtuális csomagokban is)\n"
+"                   - kiterjesztett fordított keresés (virtuális csomagokban "
+"is)\n"
 
 #: ../urpmq:95
 #, c-format
@@ -3275,7 +3234,8 @@ msgstr ""
 #: ../urpmq:98
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - teljes információ, az eltávolítandó csomaggal együtt\n"
+msgstr ""
+"  -c             - teljes információ, az eltávolítandó csomaggal együtt\n"
 
 #: ../urpmq:100
 #, c-format
@@ -3285,7 +3245,8 @@ msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - hasznos információk kiírása könnyen olvasható formában\n"
+msgstr ""
+"  -i             - hasznos információk kiírása könnyen olvasható formában\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3300,32 +3261,41 @@ msgstr "  -m             - egyenértékű a -du opcióval\n"
 #: ../urpmq:104
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
+msgstr ""
+"  -r             - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
 
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - a következő csomag egy forráscsomag (--src opcióval azonos)\n"
+msgstr ""
+"  -s             - a következő csomag egy forráscsomag (--src opcióval "
+"azonos)\n"
 
 #: ../urpmq:106
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
 
 #: ../urpmq:107
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
+msgstr ""
+"  -y             - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
 
 #: ../urpmq:108
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             - mint -y, de a kis- és nagybetűket nem különbözteti meg\n"
+msgstr ""
+"  -Y             - mint -y, de a kis- és nagybetűket nem különbözteti meg\n"
 
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  a parancssorban megadott csomagok illetve RPM-fájlok lesznek lekérdezve\n"
+msgstr ""
+"  a parancssorban megadott csomagok illetve RPM-fájlok lesznek lekérdezve\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3345,52 +3315,75 @@ msgstr "használja a -l opciót a fájllistához"
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény van a(z) \"%s\" csomaghoz"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
+"van a(z) \"%s\" csomaghoz"
 
 #: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény van a(z) \"%s\" csomagokhoz"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
+"van a(z) \"%s\" csomagokhoz"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s\" csomaghoz"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
+"\" csomaghoz"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s\" csomagokhoz"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
+"\" csomagokhoz"
 
 #: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "Változási lista nem található\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Adatforrás frissítése...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "a(z) \"%s\" fájl vizsgálata"
+
 #~ msgid "invalid MD5SUM file"
 #~ msgstr "érvénytelen MD5SUM fájl"
+
 #~ msgid "found probed synthesis as %s"
 #~ msgstr ""
 #~ "a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) "
 #~ "talált: %s"
+
 #~ msgid "  --update       - create an update medium.\n"
 #~ msgstr "  --update       - frissítési adatforrás létrehozása\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "helytelen URL: [%s]"
+
 #~ msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 #~ msgstr "távoli .src.rpm-fájlok nem telepíthetők a --install-src opcióval"
+
 #~ msgid "Error"
 #~ msgstr "Hiba"
+
 #~ msgid "%d installation transaction failed"
 #~ msgid_plural "%d installation transactions failed"
 #~ msgstr[0] "%d telepítési művelet nem sikerült"
 #~ msgstr[1] "%d telepítési művelet nem sikerült"
+
 #~ msgid "Package %s can not be installed"
 #~ msgstr "A(z) \"%s\" csomag nem telepíthető"
+
 #~ msgid "Checking to remove the following packages"
 #~ msgstr "Ellenőrzés a következő csomagok eltávolításához"
+
 #~ msgid "%s database locked"
 #~ msgstr "a(z) \"%s\" adatbázis zárolt"
 
@@ -3401,19 +3394,26 @@ msgstr "Változási lista nem található\n"
 #~ msgstr ""
 #~ "  --auto         - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
 #~ "                   válaszok lesznek feltételezve\n"
+
 #~ msgid "Unknown option %s"
 #~ msgstr "Ismeretlen opció: \"%s\""
+
 #~ msgid "too many mount points for removable medium \"%s\""
 #~ msgstr "túl sok csatolási pont ehhez a cserélhető adatforráshoz: \"%s\""
+
 #~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 #~ msgstr ""
 #~ "A(z) \"%s\" adatforrás egy ISO-képmás - menet közben csatolásra kerül"
+
 #~ msgid "using different removable device [%s] for \"%s\""
 #~ msgstr "eltérő cserélhető eszköz (\"%s\") használata ehhez: \"%s\""
+
 #~ msgid "unable to retrieve pathname for removable medium \"%s\""
 #~ msgstr "a következő cserélhető adatforrás útvonala nem elérhető: \"%s\""
+
 #~ msgid "unable to mount the distribution medium"
 #~ msgstr "nem sikerült csatolni a disztribúciós adatforrást"
+
 #~ msgid ""
 #~ "unable to access medium \"%s\",\n"
 #~ "this could happen if you mounted manually the directory when creating the "
@@ -3422,13 +3422,17 @@ msgstr "Változási lista nem található\n"
 #~ "A(z) \"%s\" adatforrás nem elérhető.\n"
 #~ "Lehetséges, hogy az adatforrás létrehozásakor kézzel lett csatolva a "
 #~ "megfelelő könyvtár."
+
 #~ msgid "inconsistent medium \"%s\" marked removable but not really"
 #~ msgstr ""
 #~ "a(z) \"%s\" hibás adatforrás cserélhetőnek van jelölve, pedig nem az"
+
 #~ msgid "  -c             - clean headers cache directory.\n"
 #~ msgstr "  -c             - a fejlécgyorstár könyvtárának kiürítése\n"
+
 #~ msgid "virtual medium needs to be local"
 #~ msgstr "minden virtuális adatforrásnak helyinek kell lennie"
+
 #~ msgid "Error generating names file: Can't write to file (%s)"
 #~ msgstr ""
 #~ "Nem sikerült elkészíteni a névfájlt - nem sikerült írni a fájlba (%s)"
@@ -3436,95 +3440,124 @@ msgstr "Változási lista nem található\n"
 #, fuzzy
 #~ msgid "unable to parse synthesis file of \"%s\""
 #~ msgstr "fejléclista nem elemezhető: \"%s\""
+
 #~ msgid "found %d rpm headers in cache, removing %d obsolete headers"
 #~ msgstr ""
 #~ "a gyorstárban %d RPM-fejléc található, %d elavult fejléc eltávolítása"
+
 #~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
 #~ msgstr ""
 #~ "a meglevő forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
 #~ "összegének kiszámítása - %s"
+
 #~ msgid ""
 #~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 #~ "ignored"
 #~ msgstr ""
 #~ "a virtuális \"%s\" adatforráshoz nem tartozhat definiált fejléclista vagy "
 #~ "listafájl, ezért az adatforrás nem lesz feldolgozva"
+
 #~ msgid "invalid hdlist name"
 #~ msgstr "érvénytelen fejléclista-név"
+
 #~ msgid "unable to find list file for \"%s\", medium ignored"
 #~ msgstr ""
 #~ "\"%s\" listafájlja nem található; az adatforrás nem kerül feldolgozásra"
+
 #~ msgid "\"synthesis\" should not be set (medium \"%s\")"
 #~ msgstr ""
 #~ "a \"kiterjesztett függőséglista\" opció itt nem állítható be (adatforrás: "
 #~ "\"%s\")"
+
 #~ msgid "\"synthesis\" should be set (medium \"%s\")"
 #~ msgstr ""
 #~ "a \"kiterjesztett függőséglista\" opció itt beállítandó (adatforrás: \"%s"
 #~ "\")"
+
 #~ msgid "unable to access list file of \"%s\""
 #~ msgstr "\"%s\" listafájlja nem elérhető"
+
 #~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 #~ msgstr ""
 #~ "a(z) \"%s\" adatforrás egy használatban levő fejléclistát próbált "
 #~ "használni; az adatforrás nem kerül feldolgozásra"
+
 #~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
 #~ msgstr ""
 #~ "a(z) \"%s\" adatforrás egy használatban levő listát próbált használni; az "
 #~ "adatforrás nem kerül feldolgozásra"
+
 #~ msgid "wrote %s"
 #~ msgstr "\"%s\" elkészítve"
+
 #~ msgid ""
 #~ "Note: no hdlist for medium \"%s\", unable to return any result for it"
 #~ msgstr ""
 #~ "Megjegyzés: nincs fejléclista a(z) \"%s\" adatforráshoz, ezért azt nem "
 #~ "lehet feldolgozni"
+
 #~ msgid "performing second pass to compute dependencies\n"
 #~ msgstr "függőségek meghatározása - második lépés\n"
+
 #~ msgid "building hdlist [%s]"
 #~ msgstr "fejléclista készítése: \"%s\""
+
 #~ msgid ""
 #~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 #~ "corrupted."
 #~ msgstr ""
 #~ "A(z) \"%s\" adatforráshoz nem készíthető kiterjesztett függőséglista. "
 #~ "Lehetséges, hogy a fejléclista sérült."
+
 #~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
 #~ msgstr ""
 #~ "hiba történt a(z) \"%s\" adatforrás fejléclistájának vagy kiterjesztett "
 #~ "függőséglistájának olvasásakor"
+
 #~ msgid "computing md5sum of copied source hdlist (or synthesis)"
 #~ msgstr ""
 #~ "a lemásolt forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
 #~ "ellenőrzőösszegének kiszámítása"
+
 #~ msgid "...retrieving failed: md5sum mismatch"
 #~ msgstr "...a behozatal sikertelen: hibás MD5-ös ellenőrzőösszeg"
+
 #~ msgid "no rpm files found from [%s]"
 #~ msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
+
 #~ msgid "unable to read rpm files from [%s]: %s"
 #~ msgstr "csomagfájlok (RPM) nem olvashatók innen: \"%s\" - %s"
+
 #~ msgid "no rpms read"
 #~ msgstr "csomagfájlok (RPM) nem lettek beolvasva"
+
 #~ msgid "reading headers from medium \"%s\""
 #~ msgstr "\"%s\" adatforrás fejléceinek olvasása"
+
 #~ msgid "    --probe-synthesis - use synthesis file.\n"
 #~ msgstr "    --probe-synthesis - kiterjesztett függőséglista felhasználása\n"
+
 #~ msgid "    --probe-hdlist - use hdlist file.\n"
 #~ msgstr "    --probe-hdlist - fejléclista felhasználása\n"
+
 #~ msgid ""
 #~ "Note: since no media searched uses hdlists, urpmf was unable to return "
 #~ "any result\n"
 #~ msgstr ""
 #~ "Megjegyzés: a feldolgozott adatforrások egyike sem használ fejléclistát, "
 #~ "ezért az urpmf nem tudott eredményt adni\n"
+
 #~ msgid "You may want to use --name to search for package names.\n"
 #~ msgstr "Csomagnevek keresésére használható a --name opció.\n"
+
 #~ msgid "  --src, -s      - next package is a source package.\n"
 #~ msgstr "  --src, -s      - a következő csomag egy forráscsomag\n"
+
 #~ msgid "  --probe-hdlist - use hdlist file.\n"
 #~ msgstr "  --probe-hdlist - fejléclista felhasználása\n"
+
 #~ msgid "unable to update medium \"%s\"\n"
 #~ msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
+
 #~ msgid "unable to create medium \"%s\"\n"
 #~ msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
-
diff --git a/po/id.po b/po/id.po
index a59fcdc6..de26f428 100644
--- a/po/id.po
+++ b/po/id.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2007-03-22 08:14+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -24,22 +24,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Instalasi RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Kesalahan: tidak dapat mencari file %s, membatalkan operasi"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -59,7 +59,7 @@ msgstr ""
 "akan dapat membuat modifikasi ke sourcecodenya lalu mengkompilenya)\n"
 "Apa yang akan Anda lakukan?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "Lanjutkan?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -89,22 +89,22 @@ msgstr ""
 "\n"
 "Anda dapat menyimpannya. Apakah pilihan anda?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "Install"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Pilih lokasi penyimpanan file"
@@ -211,12 +211,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Tidak ada paket yang ditentukan"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Silahkan menunggu..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Harus sebagai root"
@@ -247,42 +247,42 @@ msgstr ""
 "%s\n"
 "Lanjutkan installasi?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr "(untuk upgrade)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr "(untuk menginstal)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Pilihan paket"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Salah satu paket berikut dibutuhkan:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Batal"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -293,56 +293,63 @@ msgstr ""
 "%s\n"
 "Lanjutkan installasi?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Untuk memenuhi ketergantungan, paket berikut akan diinstall:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Untuk memenuhi ketergantungan, paket-paket berikut juga akan diinstal:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paket, %d MB)"
 msgstr[1] "(%d paket, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "tidak dapat mengambil paket sumber, dibatalkan"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Persiapan..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Menginstall paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Harap masukkan media bernama \"%s\" ke perangkat [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Mendownload paket `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...pengambilan gagal: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Selesai"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -353,28 +360,27 @@ msgstr ""
 "%s\n"
 "Anda mungkin perlu meng-update database urpmi Anda"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalasi gagal:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Semua paket telah terinstal"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalasi selesai"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "menghapus %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "jalankan ulang urpmi"
@@ -448,58 +454,52 @@ msgstr "Direktori lingkungan %s tidak ada"
 msgid "using specific environment on %s\n"
 msgstr "mengunakan lingkungan spesifik pada %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "gagal membuka rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nama file rpm [%s] tak valid"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "mengambil file rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...pengambilan selesai"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pengambilan gagal: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "gagal mengakses file rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "gagal mem-parse file spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "gagal meregistrasi file rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Arsitektur tidak kompatibel untuk rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "kesalahan meregistrasi paket lokal"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Operasi ini dilarang ketika berjalan dalam mode terbatas"
@@ -539,22 +539,22 @@ msgstr "Pola ekspresi:\n"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Direktori chroot tidak ada"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Tidak bisa menggunakan %s tanpa %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Tidak bisa menggunakan %s dengan %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Terlalu banyak argumen\n"
@@ -646,82 +646,87 @@ msgstr "%s gagal: keluar dengan sinyal %d"
 msgid "%s failed: exited with %d"
 msgstr "%s gagal: keluar dengan %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "penyalinan gagal"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget tidak ada\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl tidak ada\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl gagal: download dibatalkan\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync tidak ada\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh tidak ada\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla tidak ada\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Tidak bisa mengeksekusi prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "prozilla tidak ada\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% dari %s selesai, ETA = %s, kecepatan = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% selesai, kecepatan = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "menerima %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "menerima %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protokol tidak dikenal didefinisikan untuk %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch tidak ditemukan, webfetch yang didukung adalah: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "gagal menangani protokol: %s"
@@ -741,59 +746,59 @@ msgstr "paket %s tak ditemukan."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "mengambil file rpm dari media \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[pemaketan ulang]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "membuat transaksi untuk instalasi di %s (hapus=%d, instal=%d, upgrade=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "gagal membuat transaksi"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "tidak bisa mengurai rpm dari paket delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "gagal menginstal paket %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "menghapus rpm yang terinstall (%s) dari %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...pengambilan gagal: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "menghapus paket %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "menghapus paket %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "menghapus rpm yang terinstall (%s) dari %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Informasi tambahan pada paket %s"
@@ -838,75 +843,80 @@ msgstr "Peringatan"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Installasi gagal pada node %s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Paket berikut memiliki tandatangan yang cacat"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Paket berikut memiliki tandatangan yang cacat"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Apakah Anda hendak melanjutkan instalasi ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "menghapus rpm yang terinstall (%s) dari %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "sebarkan %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "menginstall %s dari %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "menginstall %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Mencoba installasi tanpa menguji ketergantungan? (y/T) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Mencoba installasi lebih keras (--force)? (y/T) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paket-paket sudah update"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Installasi dimungkinkan"
@@ -1113,7 +1123,7 @@ msgstr "penyalinan [%s] gagal (file dicurigai terlalu kecil)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "menghitung md5sum hdlist source (atau sintesa) yang diambil"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "penyalinan [%s] gagal (md5sum tidak cocok)"
@@ -1153,32 +1163,32 @@ msgstr "file hdlist utk media \"%s\" tak ditemukan"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "mengambil hdlist source (atau sintesa) \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "memeriksa file pubkey dari \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...kunci %s terimport dari file pubkey \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "gagal mengimpor file pubkey dari \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "file hdlist utk media \"%s\" tak ditemukan"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "media \"%s\" sudah diupdate"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1193,94 +1203,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "membaca file rpm dari [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "TtNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/T) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Maaf, pilihan buruk, coba lagi\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "Pilihan paket"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Cari"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "menambahkan media \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1362,309 +1377,6 @@ msgstr "me-mount %s"
 msgid "unmounting %s"
 msgstr "melepas mount %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf versi %s\n"
-"Hak cipta (C) 2002-2006 Mandriva.\n"
-"Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
-"GPL GNU.\n"
-"\n"
-"pemakaian:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version         - cetak nomor versi perkakas ini.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - gunakan lingkungan khusus (umumnya laporan kecacatan).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - jangan pakai media yang diberikan, dipisahkan dengan "
-"koma.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - jangan melakukan pencocokan pola, gunakan argumen  "
-"sebagai string literal.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - gunakan root lain untuk installasi db urpmi & rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - urutkan media menurut substring yang dipisahkan dengan "
-"koma.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - jangan cetak baris identik dua kali.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - hanya pakai media update.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - mode verbose.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - abaikan perbedaan huruf besar/kecil dalam setiap pola.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - menerima perbedaan huruf besar/kecil pada pola "
-"(default).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - ganti field pemisah (default menjadi ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Pola ekspresi:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  teks           - sembarang teks diparsing sebagai regexp, kecuali -l "
-"digunakan.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-"  -e             - sertakan kode perl secara langsung sebagai perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operator AND biner.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operator OR biner.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unary NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )              - tanda kurung kiri dan kanan.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Daftar tag:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr ""
-"  --qf            - tentukan sebuah format output yang menyerupai printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   contoh: '%%name:%%file'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch          - arsitektur\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - buat host\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - buat waktu\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - file konfigurasi\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - tag konflik tag\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - penjelasan paket\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribusi\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch          - epoch\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename          - nama file paket\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files             - daftar file yang terdapat pada paket\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - grup\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name          - nama paket\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name          - nama paket\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - tag kadaluarsa\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - pemaket\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - tag yang disediakan\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - tag kebutuhan\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - ukuran yang terinstall\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nama rpm sumber\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - tag kadaluarsa\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary     - ringkasan\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor      - vendor\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - media dimana paket ditemukan\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - cetak versi, rilis dan arch dengan nama.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-"Format tidak benar: Anda hanya boleh menggunakan satu tag yang bernilai "
-"banyak"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "file hdlist utk media \"%s\" tak ditemukan"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "membangun file sintesa hdlist untuk media \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "menulis ke file list untuk media \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1681,7 +1393,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Tidak ada paket bernama %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Paket berikut berisi %s: %s"
@@ -1691,47 +1403,47 @@ msgstr "Paket berikut berisi %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Paket-paket %s tidak bisa diinstall"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Paket %s telah terinstall"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paket-paket %s telah terinstal"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "karena %s hilang"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Paket %s telah terinstall"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "karena %s tidak terpenuhi"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "mencoba mempromosikan %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "untuk menjaga %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1740,7 +1452,7 @@ msgstr ""
 "Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1749,12 +1461,12 @@ msgstr ""
 "Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "untuk menginstall %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "karena konflik dengan %s"
@@ -1847,6 +1559,13 @@ msgstr "  --repackage     - Paket ulang file sebelum menghapus\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - gunakan root lain untuk penghapusan rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - gunakan root lain untuk installasi db urpmi & rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1877,38 +1596,38 @@ msgstr "  --verbose, -v  - mode verbose.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - pilih semua paket yang cocok dengan ekspresi.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Hanya superuser yang diperbolehkan menghapus paket"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "paket tidak dikenal"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "paket tidak dikenal"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "menghapus paket %s akan merusak sistem Anda"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Tidak ada yang dihapus"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Tidak ada yang dihapus"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1916,44 +1635,334 @@ msgid_plural ""
 msgstr[0] "Untuk memenuhi ketergantungan, paket berikut akan dihapus"
 msgstr[1] "Untuk memenuhi ketergantungan, paket-paket %d berikut akan dihapus"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "paket tidak dikenal"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Hapus %d paket?"
 msgstr[1] "Hapus %d paket?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/T) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "menganggap divais removable sebagai \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Penghapusan gagal"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Penghapusan gagal"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf versi %s\n"
+"Hak cipta (C) 2002-2006 Mandriva.\n"
+"Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
+"GPL GNU.\n"
+"\n"
+"pemakaian:\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version         - cetak nomor versi perkakas ini.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - gunakan lingkungan khusus (umumnya laporan kecacatan).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - jangan pakai media yang diberikan, dipisahkan dengan "
+"koma.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - jangan melakukan pencocokan pola, gunakan argumen  "
+"sebagai string literal.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - urutkan media menurut substring yang dipisahkan dengan "
+"koma.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - jangan cetak baris identik dua kali.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - hanya pakai media update.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - mode verbose.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - abaikan perbedaan huruf besar/kecil dalam setiap pola.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - menerima perbedaan huruf besar/kecil pada pola "
+"(default).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - ganti field pemisah (default menjadi ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Pola ekspresi:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  teks           - sembarang teks diparsing sebagai regexp, kecuali -l "
+"digunakan.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+"  -e             - sertakan kode perl secara langsung sebagai perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operator AND biner.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operator OR biner.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unary NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )              - tanda kurung kiri dan kanan.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Daftar tag:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr ""
+"  --qf            - tentukan sebuah format output yang menyerupai printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   contoh: '%%name:%%file'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch          - arsitektur\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - buat host\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - buat waktu\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - file konfigurasi\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - tag konflik tag\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - penjelasan paket\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribusi\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch          - epoch\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename          - nama file paket\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files             - daftar file yang terdapat pada paket\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - grup\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name          - nama paket\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - nama paket\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - tag kadaluarsa\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - pemaket\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - tag yang disediakan\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - tag kebutuhan\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - ukuran yang terinstall\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nama rpm sumber\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - tag kadaluarsa\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary     - ringkasan\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor      - vendor\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - media dimana paket ditemukan\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - cetak versi, rilis dan arch dengan nama.\n"
+
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Pola ekspresi:\n"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Format tidak benar: Anda hanya boleh menggunakan satu tag yang bernilai "
+"banyak"
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "file hdlist utk media \"%s\" tak ditemukan"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "membangun file sintesa hdlist untuk media \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "menulis ke file list untuk media \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2304,48 +2313,43 @@ msgstr ""
 "Kesalahan: %s tampaknya di-mount sebagai read-only.\n"
 "Gunakan --allow-force untuk memaksa operasi."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Mengupdate media...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (untuk upgrade)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (untuk upgrade)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (untuk menginstal)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (untuk menginstal)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Untuk memenuhi ketergantungan, paket berikut akan dihapus"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2356,7 +2360,7 @@ msgstr ""
 "yang lebih lama dari yang terinstall:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2367,7 +2371,7 @@ msgstr ""
 "yang lebih lama dari yang terinstall:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2376,12 +2380,12 @@ msgstr ""
 "\n"
 "Lanjutkan installasi?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/t) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2390,7 +2394,7 @@ msgstr ""
 "Paket yang diminta tidak dapat diinstall:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2399,12 +2403,12 @@ msgstr ""
 "Beberapa paket yang diminta tidak dapat diinstall:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "menghapus paket %s akan merusak sistem Anda"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2415,7 +2419,7 @@ msgstr ""
 "agar yang lain dapat di-upgrade:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2426,12 +2430,12 @@ msgstr ""
 "agar yang lain dapat di-upgrade:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(hanya pengujian, penghapusan tidak akan dilakukan)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2441,46 +2445,46 @@ msgstr ""
 "Anda perlu jadi root untuk menginstall ketergantungan berikut:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Untuk memenuhi ketergantungan, paket berikut akan dihapus"
 msgstr[1] "Untuk memenuhi ketergantungan, paket-paket %d berikut akan dihapus"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(hanya pengujian, installasi tidak akan dilakukan)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Lanjutkan dengan installasi satu paket?"
 msgstr[1] "Lanjutkan dengan installasi paket-paket %d?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tekan [Enter] jika siap.."
@@ -2931,13 +2935,13 @@ msgstr "  -f             - paksa pembuatan file sintesa/hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Hanya superuser yang diijinkan mengupdate media"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "tidak ada yang diupdate (pakailah urpmi.addmedia untuk menambah media)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2946,17 +2950,17 @@ msgstr ""
 "masukan update hilang\n"
 "(satu dari %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "Mengabaikan media %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "mengaktifkan media media %s"
@@ -3239,6 +3243,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Changelog tidak ditemukan\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Mengupdate media...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "memeriksa file %s"
 
diff --git a/po/is.po b/po/is.po
index 04ac3b16..25e4404d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2007-11-29 14:14+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM innsetning"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Villa: finn ekki skrá %s, mun stöðva aðgerð"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "Í _lagi"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "Hvað vilt þú gera?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "Halda áfram?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -85,22 +85,22 @@ msgstr ""
 "\n"
 "Þú vilt kannski frekar aðeins vista pakkana. Hvað velur þú?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "Setja _upp"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "Vi_sta"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "Hætta _við"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Veldu stað til að vista skrá"
@@ -205,12 +205,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Engir pakkar tilgreindir"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Vinsamlega bíðið..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Verður að vera root"
@@ -241,42 +241,42 @@ msgstr ""
 "%s\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Í lagi"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (til að uppfæra)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (til að setja inn)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Pakkaval"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Hætta við"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -287,56 +287,63 @@ msgstr ""
 "%s\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakki, %d MB)"
 msgstr[1] "(%d pakkar, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Get ekki sótt frumpakka, hætti við"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Undirbý..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Set inn pakka `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Vinsamlega settu inn %s %s"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Sæki pakka `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...mistókst að sækja: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Lokið"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -347,28 +354,27 @@ msgstr ""
 "%s\n"
 "Þú ættir sennilega að uppfæra urpmi gagnagrunninn"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Innsetning brást:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Allt er nú þegar komið inn"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Innsetningu lokið"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "fjarlægi %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "endurræsi urpmi"
@@ -442,58 +448,52 @@ msgstr "Umhverfismappa %s er ekki til"
 msgid "using specific environment on %s\n"
 msgstr "nota tilgreint umhverfi á %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "gat ekki opnað rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ógilt rpm skráarnafn [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "sæki rpm skrá [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...niðurhali lokið"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...mistókst að sækja: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "get ekki lesið rpm skrá [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "get ekki unnið úr spec skrá %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "gat ekki skráð rpm skrá"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "ósamhæfður vélbúnaður fyrir rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "villa við að skrá staðbundna pakka"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Þessi aðgerð er bönnuð þegar keyrt er í vernduðum ham"
@@ -533,22 +533,22 @@ msgstr "Mynstursegðir:\n"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot mappa er ekki til"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Get ekki notað %s án %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Get ekki notað %s með %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Of mörg viðföng\n"
@@ -640,82 +640,87 @@ msgstr "%s mistókst: hætti mið villumerki %d"
 msgid "%s failed: exited with %d"
 msgstr "%s mistókst: hætti með %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "afritun mistókst"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget vantar\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl vantar\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl mistókst: hætt við að sækja skrá\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync vantar\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh vantar\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla vantar\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Gat ekki keyrt prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "prozilla vantar\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% of %s lokið, lýkur = %s, hraði = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% lokið, hraði = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "sæki %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "sótti %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "óþekkt samskiptaregla skilgreind fyrir %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "forrit til að sækja af vef fannst ekki, studd forrit eru: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "skil ekki samskiptareglu: %s"
@@ -735,59 +740,59 @@ msgstr "pakki %s fannst ekki."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "sæki rpm skrá frá miðli \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[endurpökkun]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "bjó til færslu fyrir uppsetningu á %s (fjarlægi=%d, set inn=%d, uppfæri=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "Gat ekki búið til færslu"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "gat ekki dregið rpm úr breytinga-rpm pakka %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "get ekki sett inn pakka %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "fjarlægi uppsett rpm (%s) frá %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...mistókst að sækja: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Fjarlægi pakka %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "fjarlægi pakka %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "fjarlægi uppsett rpm (%s) frá %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Meiri upplýsingar um pakka %s"
@@ -832,75 +837,80 @@ msgstr "hætti við"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Innsetning brást"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Innsetning brást:"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Eftirfarandi pakki er með gallaða undirskrift"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Viltu halda áfram með uppsetningu ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "fjarlægi uppsett rpm (%s) frá %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "miðla %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "set inn %s frá %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "Set inn %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf? (j/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pakkar eru uppfærðir"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Innsetning er möguleg"
@@ -1104,7 +1114,7 @@ msgstr "afrit af [%s] brást (skráin er grunsamlega lítil)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "reikna md5 gátsummu yfir sótta hdlist skrá (eða samantektar-skrá)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "afrit af [%s] brást (md5 gátsumma passar ekki)"
@@ -1144,32 +1154,32 @@ msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "sæki hdlist skrá (eða samantektar-skrá) fyrir \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "athuga lykilskrá \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...flutti inn lykil %s úr lyklaskrá \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "gat ekki flutt inn lykilskrá \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uppfærði miðil \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1184,94 +1194,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "les rpm skrár frá [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Slæmt val.  Reyndu aftur\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pakki"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Útgáfa"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Undirútgáfa"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Vélb"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(tillaga)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "miðill \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "skipanalína"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1354,303 +1369,6 @@ msgstr "tengi %s"
 msgid "unmounting %s"
 msgstr "aftengi %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf útgáfa %s\n"
-"Höfundaréttur © 2002-2006 Mandriva.\n"
-"Þetta er frjáls hugbúnaður og má dreifa samkvæmt skilmálum GNU GPL.\n"
-"\n"
-"notkun: urpmf [valkostir] mynstur\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - prenta útgáfunúmer þessa tóls.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - nota tiltekið umhverfi (yfirleitt vegna "
-"villutilkynninga).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - nota ekki uppgefna miðla, aðskildir með kommum.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - ekki leita að mynstrum, nota viðfang sem uppgefinn "
-"ákveðinn texta.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - nota aðra rót fyrir urpmi gagnagrunn og rpm uppsetningu.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - raða miðlum eftir undirstrengjum, aðskildir með kommum.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - nota gefna slóð fyrir aðgang að miðli\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - nota gefna samantektar-skrá í stað urpmi gagnagrunns.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ekki prenta tvíteknar línur.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - nota aðeins uppfærslu-miðil.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - ítarlegri hamur.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - hunsa stafastærð í samanburði allra mynstra.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - virða stafastærð í samanburði allra mynstra "
-"(sjálfgefið).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - breyta svæðis-skila-staf (sjálfgefið ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Mynstursegðir:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - allur texti er meðhöndlaður sem regluleg segð, nema -l sé "
-"notað.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - innifela perl kóða beint sem perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - tvíundarvirki OG.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - tvíundarvirki EÐA.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - formerki EKKI.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - vinstri og hægri svigar.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Listi af tögum:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - tilgreina printf-líkt úttakssnið\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   example: '%%nafn:%%skrár'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - vélbúnaðartegund\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - byggt á vél.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - hvenær byggt\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - uppsetningaskrár\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - ósamræmanleg tög\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - lýsing pakka.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - dreifing\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - tímapunktur.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - skráarnafn pakka\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - listi af skrám sem eru í pakkanum\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - hópur.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      -höfundarleyfi\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - pakkanafn.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - úreldir\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - pakkað af\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - hvað er skaffað.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - þarfnast\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - stærð.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - frumrpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - tillögur um tög\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - samantekt\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - slóð.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - útgefandi\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - miðillinn sem innihélt pakkann\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - prenta útgáfu, undirnúmer og vélartegund með nafni.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Ógilt snið: þú mátt aðeins nota eitt fjölgildis-tag"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "byggði hdlist samantektar-skrá fyrir miðil \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "skrifa lista-skrá fyrir miðil \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1667,7 +1385,7 @@ msgstr "urpmi var endurræst, og listi forgangspakka breyttist: %s í stað %s"
 msgid "No package named %s"
 msgstr "Enginn pakki heitir %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Eftirfarandi pakkar innihalda %s: %s"
@@ -1677,47 +1395,47 @@ msgstr "Eftirfarandi pakkar innihalda %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Ekki er hægt að setja inn pakka %s"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakki %s er nú þegar kominn inn"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pakkar %s eru nú þegar komnir inn"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "vegna þess að %s vantar"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "því pakki %s er uppsettur"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vegna óuppfylltra %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "þegar reynt var að setja upp %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "til þess að halda %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1726,7 +1444,7 @@ msgstr ""
 "Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1735,12 +1453,12 @@ msgstr ""
 "Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "til þess að setja inn %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "vegna árekstra við %s"
@@ -1831,6 +1549,13 @@ msgstr "  --repackage    - Endur-pakka skrám áður en eytt\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - nota aðra rót til að fjarlægja rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - nota aðra rót fyrir urpmi gagnagrunn og rpm uppsetningu.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1860,39 +1585,39 @@ msgstr "  --verbose, -v  - ítarlegri hamur.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - velja alla pakka sem passa við segð.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Aðeins kerfisstjóri hefur leyfi til að fjarlægja pakka"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "óþekktir pakkar"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "Óþekktur pakki"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
 msgstr[1] "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ekkert til að fjarlægja"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Ekkert til að fjarlægja"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1902,45 +1627,329 @@ msgstr[0] ""
 msgstr[1] ""
 "Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "Óþekktur pakki"
 msgstr[1] "Óþekktur pakki"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Fjarlæga %d pakka?"
 msgstr[1] "Fjarlæga %d pakka?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (J/n) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "tek útskiptanleg tæki sem \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Mistókst að fjarlægja"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Mistókst að fjarlægja"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf útgáfa %s\n"
+"Höfundaréttur © 2002-2006 Mandriva.\n"
+"Þetta er frjáls hugbúnaður og má dreifa samkvæmt skilmálum GNU GPL.\n"
+"\n"
+"notkun: urpmf [valkostir] mynstur\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - prenta útgáfunúmer þessa tóls.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - nota tiltekið umhverfi (yfirleitt vegna "
+"villutilkynninga).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - nota ekki uppgefna miðla, aðskildir með kommum.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - ekki leita að mynstrum, nota viðfang sem uppgefinn "
+"ákveðinn texta.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - raða miðlum eftir undirstrengjum, aðskildir með kommum.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - nota gefna slóð fyrir aðgang að miðli\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - nota gefna samantektar-skrá í stað urpmi gagnagrunns.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ekki prenta tvíteknar línur.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - nota aðeins uppfærslu-miðil.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - ítarlegri hamur.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - hunsa stafastærð í samanburði allra mynstra.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - virða stafastærð í samanburði allra mynstra "
+"(sjálfgefið).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - breyta svæðis-skila-staf (sjálfgefið ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Mynstursegðir:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - allur texti er meðhöndlaður sem regluleg segð, nema -l sé "
+"notað.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - innifela perl kóða beint sem perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - tvíundarvirki OG.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - tvíundarvirki EÐA.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - formerki EKKI.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - vinstri og hægri svigar.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Listi af tögum:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - tilgreina printf-líkt úttakssnið\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   example: '%%nafn:%%skrár'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - vélbúnaðartegund\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - byggt á vél.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - hvenær byggt\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - uppsetningaskrár\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - ósamræmanleg tög\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - lýsing pakka.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - dreifing\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - tímapunktur.\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - skráarnafn pakka\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - listi af skrám sem eru í pakkanum\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - hópur.\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      -höfundarleyfi\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - pakkanafn.\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - úreldir\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - pakkað af\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - hvað er skaffað.\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - þarfnast\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - stærð.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - frumrpm.\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - tillögur um tög\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - samantekt\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - slóð.\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - útgefandi\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - miðillinn sem innihélt pakkann\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - prenta útgáfu, undirnúmer og vélartegund með nafni.\n"
+
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Mynstursegðir:\n"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Ógilt snið: þú mátt aðeins nota eitt fjölgildis-tag"
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "byggði hdlist samantektar-skrá fyrir miðil \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "skrifa lista-skrá fyrir miðil \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2291,48 +2300,43 @@ msgstr ""
 "Villa: %s virðist vera tengt aðeins til lestrar.\n"
 "Notaðu --allow-force til að þvinga aðgerð."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Uppfæri miðil...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (til að uppfæra)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (til að uppfæra)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (til að setja inn)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (til að setja inn)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Til að viðhalda samræmi við %s, er þörf á einum af eftirtöldum pökkum:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hvað velur þú? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2343,7 +2347,7 @@ msgstr ""
 "sem eru eldri en þeir sem eru uppsettir:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2354,7 +2358,7 @@ msgstr ""
 "sem eru eldri en þeir sem eru uppsettir:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2363,12 +2367,12 @@ msgstr ""
 "\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2377,7 +2381,7 @@ msgstr ""
 "Ekki er hægt að setja inn umbeðinn pakka:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2386,12 +2390,12 @@ msgstr ""
 "Ekki er hægt að setja inn suma umbeðna pakka:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2402,7 +2406,7 @@ msgstr ""
 "að fjarlægja til að uppfæra aðra:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2413,12 +2417,12 @@ msgstr ""
 "að fjarlægja til að uppfæra aðra:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(aðeins prófun, ekkert verður í raun fjarlægt)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2429,7 +2433,7 @@ msgstr ""
 "pakka:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2438,39 +2442,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(aðeins prófun, ekkert verður sett inn í raun)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "diskpláss minnkar um %s."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "diskpláss eykst um %s."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "diskpláss eykst um %s."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Halda áfram með uppsetningu á einum pakka?"
 msgstr[1] "Halda áfram með uppsetningu á %d pökkum?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Sláðu á ENTER þegar tilbúinn..."
@@ -2916,12 +2920,12 @@ msgstr "  -f             - þvingauppfærslu samantektar/hdlist skráa\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Aðeins kerfisstjórar mega bæta við miðli"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ekkert til að uppfæra (notaðu urpmi.addmedia til að bæta við miðli)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2930,17 +2934,17 @@ msgstr ""
 "færsluna sem á að uppfæra vantar\n"
 "(ein af %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "hunsa miðil %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "virkja miðil %s"
@@ -3216,6 +3220,9 @@ msgstr "engin hdlist skrá fyrir miðil \"%s\", engar upplýsingar fyrir pakka %
 msgid "No changelog found\n"
 msgstr "Enginn breytilisti fannst\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Uppfæri miðil...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "athuga skrá %s"
 
diff --git a/po/it.po b/po/it.po
index 7dafefc8..afed34f6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-12-12 17:14+0100\n"
 "Last-Translator: \n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -26,22 +26,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Installazione RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Errore: impossibile trovare %s, annullo l'operazione"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "Cosa vuoi fare?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Vuoi continuare?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -92,22 +92,22 @@ msgstr ""
 "\n"
 "Potresti preferire salvarlo. Qual è la tua scelta?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Installa"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Salva"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancella"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Scegli dove salvare i file"
@@ -151,14 +151,16 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
 "sistema.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - forza l'esecuzione anche se alcuni pacchetti non "
 "esistono.\n"
@@ -176,7 +178,8 @@ msgstr ""
 #: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - usa solo i supporti nella lista, separati da virgole.\n"
+msgstr ""
+"  --media        - usa solo i supporti nella lista, separati da virgole.\n"
 
 #: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
@@ -186,7 +189,8 @@ msgstr "  -p             - abilita la ricerca tra i provides del pacchetto.\n"
 #: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - non cercare tra i provides per trovare il pacchetto.\n"
+msgstr ""
+"  -P             - non cercare tra i provides per trovare il pacchetto.\n"
 
 #: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
@@ -206,7 +210,8 @@ msgstr ""
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia        - usa solo i supporti indicati per cercare i "
 "pacchetti richiesti\n"
@@ -216,12 +221,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Nessun pacchetto selezionato"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Per favore attendi..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Devi essere root"
@@ -252,42 +257,42 @@ msgstr ""
 "%s\n"
 "Continuare?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr "(da aggiornare)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (da installare)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Scelta dei pacchetti"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "È richiesto uno dei seguenti pacchetti:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Interrompi"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -298,54 +303,63 @@ msgstr ""
 "%s\n"
 "Continuare?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Per soddisfare le dipendenze, sarà installato il seguente pacchetto:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pacchetto, %d MB)"
 msgstr[1] "(%d pacchetti, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "impossibile recuperare il pacchetto dalla fonte, interrompo"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "In preparazione..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Bisogna inserire il supporto denominato \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Download del pacchetto `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...recupero fallito: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Fatto"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -356,28 +370,27 @@ msgstr ""
 "%s\n"
 "Potresti voler aggiornare il tuo database di urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Installazione fallita:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "È già tutto installato"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Installazione completata"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "rimozione di %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "Riavvio di urpmi"
@@ -451,58 +464,52 @@ msgstr "La directory %s, specificata nelle variabili d'ambiente, non esiste"
 msgid "using specific environment on %s\n"
 msgstr "uso le variabili d'ambiente su %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "impossibile aprire il database rpm"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nome del file rpm non valido [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "recupero il file rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...recupero terminato"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...recupero fallito: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "impossibile accedere al file rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "impossibile analizzare il file spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "impossibile registrare il file rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Architettura incompatibile per il file rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "errore durante la registrazione dei pacchetti locali"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Quest'operazione non è consentita in modalità \"restricted\""
@@ -542,22 +549,22 @@ msgstr "nessuna espressione da chiudere"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "urpmf si aspetta una regexp, se non usi l'opzione « --literal »."
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "La directory chroot non esiste"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Impossibile utilizzare %s senza %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Impossibile utilizzare %s con %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Troppi argomenti\n"
@@ -653,84 +660,89 @@ msgstr "%s non riuscito: segnale di uscita %d"
 msgid "%s failed: exited with %d"
 msgstr "%s non riuscito: uscito con %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "copia non riuscita"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "manca wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "manca curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl ha fallito: download cancellato\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "manca rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "manca ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "manca prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Impossibile eseguire prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "manca aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% di %s completato, ETA = %s, velocità = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% completato, velocità = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "recupero di %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "%s recuperato"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocollo sconosciuto definito per %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 "non è stato trovato nessun programma per recuperare pacchetti,\n"
 "quelli supportati sono: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "impossibile gestire il protocollo: %s"
@@ -750,59 +762,60 @@ msgstr "il pacchetto %s non è stato trovato."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "recupero i file rpm dal supporto \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[rimpacchetto]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "creata transazione per installare su %s (rimuove=%d, installa=%d, aggiorna=%"
 "d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "impossibile creare la transazione"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "impossibile estrarre un rpm dal pacchetto delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "impossibile installare il pacchetto %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "Rimozione degli rpm difettosi (%s) da %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "rimozione di %s non riuscita: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Rimozione del pacchetto %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "rimozione del pacchetto %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "rimozione degli rpm installati (%s) da %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Più informazioni sul pacchetto %s"
@@ -847,18 +860,23 @@ msgstr "Interruzione"
 msgid "%s database is locked (another program is already using it)"
 msgstr "Il database %s è bloccato (un altro programma lo sta usando)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Installazione non riuscita"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Proseguire comunque? (y/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -867,57 +885,57 @@ msgstr ""
 "Installazione fallita, rpm difettosi:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Questo pacchetto ha una firma errata"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "I seguenti pacchetti hanno delle firme errate"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Vuoi proseguire con l'installazione?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "rimozione degli rpm installati (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuzione di %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "installazione di %s da %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "installazione di %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Provo l'installazione in modo ancora più forzato (--force)? (s/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "I pacchetti sono aggiornati"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "L'installazione è possibile"
@@ -1031,7 +1049,8 @@ msgstr "impossibile esaminare media.cfg"
 #: ../urpm/media.pm:831
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "impossibile accedere al supporto di installazione (manca il file media.cfg)"
+msgstr ""
+"impossibile accedere al supporto di installazione (manca il file media.cfg)"
 
 #: ../urpm/media.pm:849
 #, c-format
@@ -1123,7 +1142,7 @@ msgstr "copia di [%s] fallita (il file è stranamente piccolo)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "calcolo md5sum del file synthesis della fonte scaricata"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "acquisizione di [%s] fallita (md5sum non corretta)"
@@ -1163,32 +1182,32 @@ msgstr "non trovo i metadati per il supporto \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "recupero del file synthesis di \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "controllo il file pubkey di \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importata la chiave %s dal file pubkey di \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "impossibile importare il file pubkey di \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "non trovo il file synthesis per il supporto \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "supporto \"%s\" aggiornato"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "recupero di [%s] non riuscito"
@@ -1203,94 +1222,99 @@ msgstr "nuovo tentativo con il mirror %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Impossibile trovare un mirror nell'elenco %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "localizzata posizione %s %.2f %.2f nel fuso orario %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "recupero elenco dei mirror da %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Spiacente, scelta errata, prova di nuovo\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pacchetto"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versione"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Release"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arch."
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(suggerito)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "supporto \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "riga di comando"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1298,7 +1322,8 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "Questo pacchetto ora è orfano. Esegui «urpme --auto-orphans» per rimuoverlo."
+msgstr[0] ""
+"Questo pacchetto ora è orfano. Esegui «urpme --auto-orphans» per rimuoverlo."
 msgstr[1] ""
 "Questi pacchetti ora sono orfani. Esegui «urpme --auto-orphans» per "
 "rimuoverli."
@@ -1377,308 +1402,16 @@ msgstr "sto montando %s"
 msgid "unmounting %s"
 msgstr "sto smontando %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf versione %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Questo è software libero e può essere ridistribuito secondo i termini della "
-"licenza GNU GPL.\n"
-"\n"
-"uso: urpmf [options] chiave-ricerca\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version         - stampa la versione di questo tool.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - usa un ambiente specifico (tipicamente un bug report).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - non usa i supporti elencati, separati da virgole.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"--literal, -l  - non considerare i caratteri speciali, usa l'argomento come "
-"è.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - cambia la directory radice per installare i file rpm e "
-"per il db di urpmi.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - ordina i supporti in base alle sottostringhe separate da "
-"virgole\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - utilizza questo percorso per accedere al supporto\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - non stampa le linee uguali.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "--update       - usa solo supporti di aggiornamento.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modalità prolissa.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignora la distinzione tra maiuscole/minuscole nella "
-"ricerca.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - distingui maiuscole/minuscole nella ricerca "
-"(predefinito).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "-F<str>       - cambia il separatore di campo (default ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Chiavi di ricerca:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "-text        - il testo è usato come regexp, se non viene specificato -l.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operatore binario AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operatore binario OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NOT unario.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "(  )              - parentesi destra e sinistra.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Elenco dei tag\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf            - specifica un formato di output simile a printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "           esempio: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch          - architettura.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - mostra il nome dell'host\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "--buildtime     - data di compilazione\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - file di configurazione\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - conflitti\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - descrizione del pacchetto.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "--distribution - distribuzione\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch          - epoca di compilazione.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename           - nome dei pacchetti.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "--files         - elenca i file presenti in un pacchetto.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - gruppo \n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licenza\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name           -  nome del pacchetto.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - lista di quanto reso obsoleto dal pacchetto.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - curatore del pacchetto.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - elementi forniti dal pacchetto.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - requisiti necessari per installare il pacchetto.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          -  dimensione del pacchetto installato.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nome dei pacchetti rpm con sorgenti.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - cerca nel campo \"suggests\"\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - sommario del pacchetto.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - cerca nel campo \"url\"\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - distributore\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m         - il supporto dov'è stato trovato il pacchetto\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - stampa versione, release e architettura con il nome.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "formato non corretto, puoi usare un solo tag "
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "manca il file hdlist per il supporto \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "manca il file di sintesi per il supporto \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "manca xml-info per il supporto \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi è stato riavviato, ma l'elenco dei pacchetti prioritari non è cambiato"
+msgstr ""
+"urpmi è stato riavviato, ma l'elenco dei pacchetti prioritari non è cambiato"
 
 #: ../urpm/select.pm:32
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 "urpmi è stato riavviato. L'elenco dei pacchetti prioritari è cambiato da %s "
 "a %s"
@@ -1688,7 +1421,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nessun pacchetto denominato %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "I seguenti pacchetti contengono %s: %s"
@@ -1698,47 +1431,47 @@ msgstr "I seguenti pacchetti contengono %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Dovresti aggiungere \"-a\" per usarli tutti"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "nel DB di urpmi ci sono i pacchetti %s, ma non sono installati"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Il pacchetto %s è già installato"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "I pacchetti %s sono già installati"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "perché manca %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "perché è già installato %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "perché non è soddisfatto %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "sto selezionando %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "per conservare %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1747,7 +1480,7 @@ msgstr ""
 "Questi pacchetti devono essere rimossi per poterne aggiornare altri:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1756,12 +1489,12 @@ msgstr ""
 "Questi pacchetti devono essere rimossi per poterne aggiornare altri:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "per installare %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "per conflitti con %s"
@@ -1826,7 +1559,8 @@ msgstr ""
 #: ../urpme:47
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - include automaticamente un pacchetto nelle scelte.\n"
+msgstr ""
+"  --auto         - include automaticamente un pacchetto nelle scelte.\n"
 
 #: ../urpme:48
 #, c-format
@@ -1836,7 +1570,8 @@ msgstr "  --auto-orphans - rimuove orfani\n"
 #: ../urpme:49
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verifica se la rimozione può avvenire correttamente.\n"
+msgstr ""
+"  --test         - verifica se la rimozione può avvenire correttamente.\n"
 
 #: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
@@ -1853,6 +1588,14 @@ msgstr "  --repackage     - Ri-pacchetta i file prima della cancellazione.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usa un'altra root per rimuovere i file rpm. \n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - cambia la directory radice per installare i file rpm e "
+"per il db di urpmi.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1886,88 +1629,377 @@ msgstr ""
 "  -a             - seleziona tutti i pacchetti che soddisfano "
 "l'espressione.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Solo superuser è abilitato a rimuovere pacchetti"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pacchetti sconosciuti"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pacchetto sconosciuto"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "la rimozione del seguente pacchetto comprometterà il sistema:"
 msgstr[1] "la rimozione dei seguenti pacchetti comprometterà il sistema:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Niente da rimuovere"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Nessun orfano da rimuovere"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "Per soddisfare le dipendenze, sarà rimosso il seguente pacchetto"
-msgstr[1] "Per soddisfare le dipendenze, saranno rimossi i seguenti %d  pacchetti"
+msgstr[1] ""
+"Per soddisfare le dipendenze, saranno rimossi i seguenti %d  pacchetti"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(pacchetto orfano)"
 msgstr[1] "(pacchetti orfani)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Rimuovo %d pacchetto?"
 msgstr[1] "Rimuovo %d pacchetti?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "test di rimozione per %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Rimozione fallita"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "La rimozione è possibile"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf versione %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Questo è software libero e può essere ridistribuito secondo i termini della "
+"licenza GNU GPL.\n"
+"\n"
+"uso: urpmf [options] chiave-ricerca\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version         - stampa la versione di questo tool.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - usa un ambiente specifico (tipicamente un bug report).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - non usa i supporti elencati, separati da virgole.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"--literal, -l  - non considerare i caratteri speciali, usa l'argomento come "
+"è.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - ordina i supporti in base alle sottostringhe separate da "
+"virgole\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - utilizza questo percorso per accedere al supporto\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - non stampa le linee uguali.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "--update       - usa solo supporti di aggiornamento.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modalità prolissa.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignora la distinzione tra maiuscole/minuscole nella "
+"ricerca.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - distingui maiuscole/minuscole nella ricerca "
+"(predefinito).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "-F<str>       - cambia il separatore di campo (default ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Chiavi di ricerca:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"-text        - il testo è usato come regexp, se non viene specificato -l.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operatore binario AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operatore binario OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NOT unario.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "(  )              - parentesi destra e sinistra.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Elenco dei tag\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf            - specifica un formato di output simile a printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "           esempio: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch          - architettura.\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - mostra il nome dell'host\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "--buildtime     - data di compilazione\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - file di configurazione\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - conflitti\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - descrizione del pacchetto.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "--distribution - distribuzione\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch          - epoca di compilazione.\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename           - nome dei pacchetti.\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "--files         - elenca i file presenti in un pacchetto.\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - gruppo \n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licenza\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name           -  nome del pacchetto.\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - lista di quanto reso obsoleto dal pacchetto.\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - curatore del pacchetto.\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - elementi forniti dal pacchetto.\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - requisiti necessari per installare il pacchetto.\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          -  dimensione del pacchetto installato.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nome dei pacchetti rpm con sorgenti.\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - cerca nel campo \"suggests\"\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - sommario del pacchetto.\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - cerca nel campo \"url\"\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - distributore\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m         - il supporto dov'è stato trovato il pacchetto\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - stampa versione, release e architettura con il nome.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "espressione non completata (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "formato non corretto, puoi usare un solo tag "
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "manca il file hdlist per il supporto \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "manca il file di sintesi per il supporto \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "manca xml-info per il supporto \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
-msgstr "  --auto-update  - aggiorna i supporti prima di aggiornare il sistema.\n"
+msgstr ""
+"  --auto-update  - aggiorna i supporti prima di aggiornare il sistema.\n"
 
 #: ../urpmi:82
 #, c-format
@@ -2047,7 +2079,8 @@ msgstr ""
 #: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - installa solo il pacchetto dei sorgenti (non i binari).\n"
+msgstr ""
+"  --install-src  - installa solo il pacchetto dei sorgenti (non i binari).\n"
 
 #: ../urpmi:99
 #, c-format
@@ -2063,8 +2096,10 @@ msgstr "  --noclean      - tieni in cache gli rpm inutilizzati.\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - forza l'installazione dei pacchetti già installati.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - forza l'installazione dei pacchetti già installati.\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2087,7 +2122,8 @@ msgstr ""
 #: ../urpmi:108
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
-msgstr "  --allow-suggests - seleziona automaticamente i pacchetti \"suggeriti\"\n"
+msgstr ""
+"  --allow-suggests - seleziona automaticamente i pacchetti \"suggeriti\"\n"
 
 #: ../urpmi:112
 #, c-format
@@ -2195,12 +2231,14 @@ msgstr "  --excludedocs  - esclude i file di documentazione.\n"
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize -non verifica lo spazio disponibile prima dell'installazione\n"
+msgstr ""
+"  --ignoresize -non verifica lo spazio disponibile prima dell'installazione\n"
 
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "--ignore-arch...- permette di installare pacchetti di altre architetture.\n"
+msgstr ""
+"--ignore-arch...- permette di installare pacchetti di altre architetture.\n"
 
 #: ../urpmi:140
 #, c-format
@@ -2239,12 +2277,14 @@ msgstr "--nolock       - non bloccare il db degli rpm\n"
 #: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - aggiorna solo i pacchetti della stessa architettura.\n"
+msgstr ""
+"  --strict-arch  - aggiorna solo i pacchetti della stessa architettura.\n"
 
 #: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - seleziona tutte le corrispondenze da riga di comando.\n"
+msgstr ""
+"  -a             - seleziona tutte le corrispondenze da riga di comando.\n"
 
 #: ../urpmi:152
 #, c-format
@@ -2295,7 +2335,8 @@ msgstr "si mette --buildrequires come opzione predefinita"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "devi utilizzare --buildrequires (predefinito) o --install-src"
 
 #: ../urpmi:253
@@ -2321,48 +2362,44 @@ msgstr ""
 "Errore: %s sembra montato in sola lettura.\n"
 "Usa --allow-force per forzare l'operazione."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Aggiorno il supporto...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (da aggiornare)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (da aggiornare)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (da installare)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (da installare)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
-msgstr "Per soddisfare le dipendenze di \"%s\" serve uno dei seguenti pacchetti:"
+msgstr ""
+"Per soddisfare le dipendenze di \"%s\" serve uno dei seguenti pacchetti:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Quale scegli? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2373,7 +2410,7 @@ msgstr ""
 "da pacchetti più vecchi di quelli già installati:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2384,7 +2421,7 @@ msgstr ""
 "da pacchetti più vecchi di quelli già installati:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2393,12 +2430,12 @@ msgstr ""
 "\n"
 "Continuo comunque l'istallazione?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2407,7 +2444,7 @@ msgstr ""
 "Uno dei pacchetti richiesti non può essere installato:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2416,12 +2453,12 @@ msgstr ""
 "Alcuni dei pacchetti richiesti non possono essere installati:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "la rimozione del pacchetto %s comprometterà il sistema"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2432,7 +2469,7 @@ msgstr ""
 "devono essere rimossi per poterne aggiornare altri:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2443,12 +2480,12 @@ msgstr ""
 "devono essere rimossi per poterne aggiornare altri:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(è solo un test, la rimozione non verrà effettuata)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2459,46 +2496,46 @@ msgstr ""
 "dipendenze:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Verrà rimosso il seguente pacchetto orfano."
 msgstr[1] "Verranno rimossi i seguenti pacchetti orfani."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(è solo un test, l'installazione non verrà fatta)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Altri %s di spazio disco saranno utilizzati."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s di spazio disco saranno liberati."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "verranno scaricati %s di pacchetti."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Procedo con l'installazione di un pacchetto?"
 msgstr[1] "Procedo con l'installazione di %d pacchetti?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Premi invio dopo averlo montato..."
@@ -2619,7 +2656,8 @@ msgstr "--interactive  - con   --distrib, chiede conferma per ogni supporto\n"
 #: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
-msgstr "  --all-media   - with  --distrib, aggiunge tutti supporti disponibili.\n"
+msgstr ""
+"  --all-media   - with  --distrib, aggiunge tutti supporti disponibili.\n"
 
 #: ../urpmi.addmedia:77
 #, c-format
@@ -2633,7 +2671,8 @@ msgstr ""
 #: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
-msgstr "  --virtual      - crea supporti virtuali che sono sempre aggiornati.\n"
+msgstr ""
+"  --virtual      - crea supporti virtuali che sono sempre aggiornati.\n"
 
 #: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
@@ -2643,12 +2682,14 @@ msgstr "  --no-md5sum    - disabilita il controllo MD5SUM sui file.\n"
 #: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
-msgstr "--nopubkey     - non importa la chiave pubblica dei supporti aggiunti\n"
+msgstr ""
+"--nopubkey     - non importa la chiave pubblica dei supporti aggiunti\n"
 
 #: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "--raw       - aggiunge il supporto alla configurazione ma non lo aggiorna.\n"
+msgstr ""
+"--raw       - aggiunge il supporto alla configurazione ma non lo aggiorna.\n"
 
 #: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
@@ -2750,7 +2791,8 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr "--list         - elenca le transizioni dalla data/durata specificata\n"
 
 #: ../urpmi.recover:38
@@ -2926,12 +2968,14 @@ msgstr "  --ignore       - non aggiornare, segna il supporto come ignorato.\n"
 #: ../urpmi.update:47
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr "  --no-ignore       - non aggiornare, segna il supporto come disponibile.\n"
+msgstr ""
+"  --no-ignore       - non aggiornare, segna il supporto come disponibile.\n"
 
 #: ../urpmi.update:49
 #, c-format
 msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
-msgstr "  --probe-rpms   -   usa direttamente i file rpm, invece di synthesis\n"
+msgstr ""
+"  --probe-rpms   -   usa direttamente i file rpm, invece di synthesis\n"
 
 #: ../urpmi.update:50
 #, c-format
@@ -2953,12 +2997,12 @@ msgstr "  -ff            - impone con forza l'aggiornamento di synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Solo superuser è abilitato ad aggiornare i supporti"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2967,17 +3011,17 @@ msgstr ""
 "la voce da aggiornare non è presente\n"
 "(uno di %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "Ignoro il supporto %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "rendo disponibile il supporto %s"
@@ -3036,7 +3080,8 @@ msgstr "  --list-url   - elenca i supporti disponibili e la loro url.\n"
 #: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - elenca i nodi disponibili quando si utilizza --parallel.\n"
+msgstr ""
+"  --list-nodes   - elenca i nodi disponibili quando si utilizza --parallel.\n"
 
 #: ../urpmq:62
 #, c-format
@@ -3045,7 +3090,8 @@ msgstr "  --list-aliases - elenca gli alias paralleli disponibili.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - mostra la configurazione nella forma usata da urpmi."
 "addmedia\n"
@@ -3059,7 +3105,8 @@ msgstr ""
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - elenca tutti i pacchetti sorgenti prima del download "
 "(solo root).\n"
@@ -3067,7 +3114,8 @@ msgstr ""
 #: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch    - permette di cercare rpm per un'altra architettura.\n"
+msgstr ""
+"  --ignorearch    - permette di cercare rpm per un'altra architettura.\n"
 
 #: ../urpmq:71
 #, c-format
@@ -3210,7 +3258,8 @@ msgstr "  -Y             - come -y, ma non distingue maiuscole da minuscole.\n"
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
+msgstr ""
+"  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3243,14 +3292,16 @@ msgstr ""
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "manca  xml-info per il supporto \"%s\", impossibile dare risultati per il "
 "pacchetto %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "manca  xml-info per il supporto \"%s\", impossibile dare risultati per i "
 "pacchetti %s"
@@ -3260,3 +3311,5 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nessun changelog trovato\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Aggiorno il supporto...\n"
diff --git a/po/ja.po b/po/ja.po
index 1a7e623c..cb330d86 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-19 07:30+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM のインストール"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "エラー: ファイル %s が見つかりません。操作をキャンセルします。"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "どうしますか？"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "続けますか？"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -86,22 +86,22 @@ msgstr ""
 "\n"
 "インストールせずに保存することもできます。どうしますか？"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "インストール(_I)"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "ファイルを保存する場所を選んでください"
@@ -200,12 +200,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "パッケージが指定されていません"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "お待ちください..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "root 権限が必要です"
@@ -236,42 +236,42 @@ msgstr ""
 "%s\n"
 "このままインストールを続けますか？"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (アップグレードするため)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (インストールするため)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "パッケージの選択"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "以下のパッケージのいずれかが必要です:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -282,55 +282,62 @@ msgstr ""
 "%s\n"
 "このままインストールを続けますか？"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "依存を満たすために以下のパッケージをインストールします:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "依存を満たすために以下のパッケージをインストールします:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 個のパッケージ, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ソースパッケージを取得できませんでした。中止します。"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "パッケージ %s (%s/%s) をインストール..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "%s という名前のメディアを挿入してください"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "パッケージ %s をダウンロード..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...取得に失敗: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "完了(_D)"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -341,28 +348,27 @@ msgstr ""
 "%s\n"
 "urpmi データベースを更新してください。"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "インストール失敗:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "パッケージは既にインストールされています"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "インストールが完了しました"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s を削除"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi を再スタートします"
@@ -436,58 +442,52 @@ msgstr "環境ディレクトリ %s が存在しません"
 msgid "using specific environment on %s\n"
 msgstr "%s に特定の環境を使用\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb を開けません"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "RPM ファイル名 [%s] が無効です"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM ファイル [%s] を取得..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...取得完了"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...取得に失敗: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM ファイル [%s] にアクセスできません"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "スペックファイル %s [%s] を分析できません"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM ファイルを登録できません"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM とアーキテクチャが一致していません [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "ローカルパッケージの登録中にエラーが発生"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "この操作は制限モードでは禁止されています"
@@ -528,22 +528,22 @@ msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "urpmf はデフォルトで正規表現を期待します。\"--literal\" を使ってください。"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot ディレクトリが存在しません"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%2$s なしで %1$s は使えません"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s は %s と一緒には使えません"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "引数が多すぎます\n"
@@ -637,82 +637,87 @@ msgstr "%s 失敗: シグナル %d で終了"
 msgid "%s failed: exited with %d"
 msgstr "%s 失敗: %d で終了"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "コピーに失敗"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget がありません\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl がありません\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失敗: ダウンロードをキャンセルしました\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync がありません\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh がありません\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla がありません\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "prozilla を実行できませんでした\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 がありません\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% / %s 完了, ETA = %s, 速度 = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 完了, 速度 = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "%s を取得"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "%s を取得しました"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s に不明なプロトコルが定義されています"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch が見つかりません。利用可能な webfetch: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "プロトコルを処理できません: %s"
@@ -732,12 +737,12 @@ msgstr "パッケージ %s は見つかりません"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "メディア %s から RPM ファイルを取得..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[repackaging 再パッケージ化]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -745,47 +750,47 @@ msgstr ""
 "%s にインストールするためのトランザクションを作成しました\n"
 "(remove=%d, install=%d, upgrade-%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "トランザクションを作成できません"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "delta-rpm パッケージ %s から RPM を抽出できません"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s をインストールできません"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "不正な RPM (%s) を %s から削除"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "%s の削除に失敗: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "%s を削除"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "%s を削除"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "インストールされている RPM (%s) を %s から削除"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "パッケージ %s の詳細情報"
@@ -830,18 +835,23 @@ msgstr "中止します"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s データベースがロックされています (他のプログラムが使用中です)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "インストールに失敗"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "このまま続けますか？ (y/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -850,57 +860,57 @@ msgstr ""
 "インストール失敗。不正な RPM です:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "以下のパッケージは署名が間違っています"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "以下のパッケージは署名が間違っています"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "インストールを続けますか？"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "インストールされている RPM (%s) を削除"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "%s を配信"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s を %s からインストール"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s をインストール"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "依存を確認せずにインストールしますか？ (y/N)[デフォルトはN] "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "インストールを強行 (--force) してみますか？(y/N)[デフォルトはN]"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "パッケージは最新です"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "インストール可能です"
@@ -1107,7 +1117,7 @@ msgstr "[%s] のコピーに失敗 (ファイルが異常に小さすぎます)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "取得した source synthesis の md5sum を計算"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] の取得に失敗 (md5sum 不一致)"
@@ -1147,32 +1157,32 @@ msgstr "メディア %s のメタデータが見つかりません"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "%s の source synthesis を取得..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "%s の公開鍵ファイルを検査..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%2$s の公開鍵ファイルから鍵 %1$s を取り込みました"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "%s の公開鍵ファイルを取り込めません"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "メディア %s に synthesis ファイルが見つかりません"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "メディア %s を更新しました"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] の取得に失敗しました"
@@ -1187,94 +1197,99 @@ msgstr "ミラー %s で再試行"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "ミラーリスト %s にミラーが見つかりませんでした"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "ジオロケーション %s %.2f %.2f (タイムゾーン: %s) が見つかりました"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "%s からミラーリストを取得"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "NnＮｎいイ"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyＹｙはハ"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N)[デフォルトはN] "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "有効な選択ではありません。やり直してください。\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "パッケージ"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "バージョン"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "リリース"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "アーキテクチャ"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(提案)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "メディア %s"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "コマンドライン"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1360,293 +1375,6 @@ msgstr "%s をマウント"
 msgid "unmounting %s"
 msgstr "%s をアンマウント"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"これはフリーソフトウェアであり、GNU GPL の条件のもとで再配布できます。\n"
-"\n"
-"使い方: urpmf [オプション] パターン表現\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - このツールのバージョンを表示\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - 特定の環境を使う (バグレポートなどのため)\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - 指定したメディアは使わない (コンマで区切る)\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - パターンで検索せずに引数を普通の文字列とみなす\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - urpmi db と RPM のインストールに他のルートを使う\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - カンマ区切りで指定したメディアごとにソートする\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib    - メディアへのアクセスに指定したパスを使う\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - urpmi のデータベースではなく指定した synthesis を使う\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - 全く同じ行は表示しない\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 更新メディアのみを使う\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 詳細モード\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - パターンの大文字小文字を区別しない\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - パターンの大文字小文字を区別する (デフォルト)\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - 区切り文字を <str> に変更 (デフォルトは ':')\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "パターン表現:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - テキストを正規表現とみなす (-l が使われていない限り)\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - Perl コードをそのまま表示\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binary AND operator\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binary OR operator\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr " !               - unary NOT\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - 左右括弧\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "タグのリスト:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf            - printf 風の出力形式を指定\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   例: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - アーキテクチャ\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - ビルドホスト\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - ビルド日時\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - 設定ファイル\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - conflict (衝突) タグ\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - パッケージの説明\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - ディストリビューション\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - エポック\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - パッケージのファイル名\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - パッケージに含まれるファイルのリスト\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - グループ\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - ライセンス\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - パッケージ名\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - obsolete (廃止) タグ\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - パッケージ作成者\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - provide (提供) タグ\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - require (要求) タグ\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - インストール後のサイズ\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - ソース RPM の名前\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - suggest (提案) タグ\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - 要約\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - ベンダー\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - パッケージのあるメディア\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - バージョン, リリース番号, アーキテクチャを表示\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "不正な形式: 多値タグは一つしか使えません"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "メディア %s には hdlist がありません"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "メディア %s には synthesis がありません"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "メディア %s には XML 情報がありません"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1663,7 +1391,7 @@ msgstr "urpmi を再スタート、優先パッケージのリストに変更が
 msgid "No package named %s"
 msgstr "%s という名前のパッケージはありません"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下のパッケージが %s を含んでいます: %s"
@@ -1673,49 +1401,49 @@ msgstr "以下のパッケージが %s を含んでいます: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "これらすべてを使うには \"-a\" を使います"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 "パッケージ %s が urpmi データベースに見つかりましたが、どれもインストールされ"
 "ていません"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "パッケージ %s は既にインストールされています"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "パッケージ %s は既にインストールされています"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "%s がないために"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "インストール済みの %s のために"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s が依存を満たしていないために"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s をアップグレードするために"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s を維持するために"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1724,7 +1452,7 @@ msgstr ""
 "更新するには以下のパッケージを削除しなければなりません:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1733,12 +1461,12 @@ msgstr ""
 "更新するには以下のパッケージを削除しなければなりません:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s をインストールするために"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s と衝突するために"
@@ -1829,6 +1557,12 @@ msgstr "  --repackage    - ファイルを削除する前に再パッケージ�
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - RPM の削除に他のルートを使う\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - urpmi db と RPM のインストールに他のルートを使う\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1860,81 +1594,356 @@ msgstr "  --verbose, -v  - 詳細モード\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 指定した表現を含むすべてのパッケージを選択\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "パッケージの削除はスーパーユーザにしかできません"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "不明なパッケージ"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "不明なパッケージ"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "以下のパッケージを削除するとシステムが壊れます:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "削除するものはありません"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "削除するオーファンはありません"
 
-#: ../urpme:149
+#: ../urpme:151
 #, 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] "依存を満たすために以下の %d 個のパッケージを削除します"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(オーファン)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%d 個のパッケージを削除しますか？"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N)[デフォルトはN] "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "%s の削除をテスト"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "削除に失敗"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "削除できます"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"これはフリーソフトウェアであり、GNU GPL の条件のもとで再配布できます。\n"
+"\n"
+"使い方: urpmf [オプション] パターン表現\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - このツールのバージョンを表示\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - 特定の環境を使う (バグレポートなどのため)\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - 指定したメディアは使わない (コンマで区切る)\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr "  --literal, -l  - パターンで検索せずに引数を普通の文字列とみなす\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - カンマ区切りで指定したメディアごとにソートする\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib    - メディアへのアクセスに指定したパスを使う\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - urpmi のデータベースではなく指定した synthesis を使う\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - 全く同じ行は表示しない\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 更新メディアのみを使う\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 詳細モード\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - パターンの大文字小文字を区別しない\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - パターンの大文字小文字を区別する (デフォルト)\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - 区切り文字を <str> に変更 (デフォルトは ':')\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "パターン表現:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - テキストを正規表現とみなす (-l が使われていない限り)\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - Perl コードをそのまま表示\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binary AND operator\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binary OR operator\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr " !               - unary NOT\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - 左右括弧\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "タグのリスト:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf            - printf 風の出力形式を指定\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   例: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - アーキテクチャ\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - ビルドホスト\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - ビルド日時\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - 設定ファイル\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - conflict (衝突) タグ\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - パッケージの説明\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - ディストリビューション\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - エポック\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - パッケージのファイル名\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - パッケージに含まれるファイルのリスト\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - グループ\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - ライセンス\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - パッケージ名\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - obsolete (廃止) タグ\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - パッケージ作成者\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - provide (提供) タグ\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - require (要求) タグ\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - インストール後のサイズ\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - ソース RPM の名前\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - suggest (提案) タグ\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - 要約\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - URL\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - ベンダー\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - パッケージのあるメディア\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - バージョン, リリース番号, アーキテクチャを表示\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "終端のない表現 (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "不正な形式: 多値タグは一つしか使えません"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "メディア %s には hdlist がありません"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "メディア %s には synthesis がありません"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "メディア %s には XML 情報がありません"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2280,48 +2289,43 @@ msgstr ""
 "エラー: %s は読み取り専用でマウントされているようです。\n"
 "操作を強制するには --allow-force を使ってください。"
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "メディアを更新...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (アップグレードするため)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (アップグレードするため)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (インストールするため)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (インストールするため)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "'%s' の依存を満たすために以下のパッケージのいずれかが必要です:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "どれを選びますか？ (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2332,7 +2336,7 @@ msgstr ""
 "パッケージに依存しているため、インストールできません:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2343,7 +2347,7 @@ msgstr ""
 "パッケージに依存しているため、インストールできません:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2352,12 +2356,12 @@ msgstr ""
 "\n"
 "このままインストールを続けますか？"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n)[デフォルトはY] "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2366,7 +2370,7 @@ msgstr ""
 "インストールできないパッケージがあります:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2375,12 +2379,12 @@ msgstr ""
 "インストールできないパッケージがあります:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s を削除するとシステムが壊れます"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2391,7 +2395,7 @@ msgstr ""
 "更新するには以下のパッケージを削除しなければなりません:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2402,12 +2406,12 @@ msgstr ""
 "更新するには以下のパッケージを削除しなければなりません:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(テストのみ、実際には削除されません)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2418,44 +2422,44 @@ msgstr ""
 "呼び出さなければなりません:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "以下のオーファンを削除します"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(テストのみ、実際にはインストールされません)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "ディスク容量を %s 使います。"
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "ディスク容量が %s 空きます。"
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s のパッケージを取得します。"
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "%d 個のパッケージのインストールを開始しますか？"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "マウントされたら Enter を押してください"
@@ -2911,12 +2915,12 @@ msgstr "  -ff             - synthesis を更に強制的に更新\n"
 msgid "Only superuser is allowed to update media"
 msgstr "メディアの更新はスーパーユーザにしかできません"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "更新するものがありません (urpmi.addmedia でメディアを追加できます)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2925,17 +2929,17 @@ msgstr ""
 "更新対象が見つかりません\n"
 "(%s の中のいずれか)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "「%s」"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "メディア %s を無視しています"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "メディア %s を有効にしています"
@@ -3210,6 +3214,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "変更ログはありません\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "メディアを更新...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "%s ファイルを検査"
 
diff --git a/po/ka.po b/po/ka.po
index 26544d51..a2112a15 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2003-01-29 23:47+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
 "Language-Team: Georgian\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -47,7 +47,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -57,7 +57,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -67,22 +67,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, fuzzy, c-format
 msgid "_Install"
 msgstr "ინსტალირება"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_შენახვა"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_გაუქმება"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
@@ -179,12 +179,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "ბრძანება არ იქნა მითითებული"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, fuzzy, c-format
 msgid "Please wait..."
 msgstr "გთხოვთ იქონიოთ მოთმინება"
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr ""
@@ -212,42 +212,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "გაფრთხილება"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "ო-ქეი"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "ავტომატური ინსტალირება"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "შესახებ..."
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -255,55 +255,62 @@ msgid ""
 "Continue installation anyway?"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, fuzzy, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...გამოძახება ჩაიშალა: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "დასრულდა"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -311,28 +318,27 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, fuzzy, c-format
 msgid "Installation finished"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "მომხმარებლის წაშლა : %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -406,58 +412,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "ვერ ვიძახებ ფაილს %s\n"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...გამოძახება დასრულდა"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...გამოძახება ჩაიშალა: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -497,22 +497,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -604,82 +604,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "შესვლა ვერ განხორციელდა"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "მომხმარებლის წაშლა : %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...გამოძახება ჩაიშალა: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s-ისთვის უცნობი პროტოკოლია განსაზღვრული"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ვერ ვუმკლავდები პროტოკოლს: %s"
@@ -699,58 +704,58 @@ msgstr "უკვე ყველაფერი ჩაწერილია"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "ვერ მოვახერხე დირექტორია %s-ის შექმნა"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...გამოძახება ჩაიშალა: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "გვერდის ინფორმაცია არ არსებობს"
@@ -795,75 +800,80 @@ msgstr "გაფრთხილება"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "გნებავთ დაამუშაოთ:"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "ინსტალაცია ჩაიშალა"
@@ -1070,7 +1080,7 @@ msgstr "...კოპირება ჩაიშალა"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "...კოპირება ჩაიშალა"
@@ -1110,32 +1120,32 @@ msgstr "პრობლემა synthesis-ის ფაილის ან მ�
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ვერ ვიძახებ ფაილს %s\n"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "დამატებული მედიუმი %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1150,94 +1160,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "nNaAა"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "yYkKxXხ"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (ხ/ა) [ხ] "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "მოძებნა:"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1319,292 +1334,6 @@ msgstr "ვაინსტალირებ: %s\n"
 msgid "unmounting %s"
 msgstr "მოხსნა (unmount)"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"mdkupdate ვერსია %s\n"
-"საავტორო უფლებები (C) %s Mandriva.\n"
-"პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
-"თანახმად გავრცელება.\n"
-"\n"
-"გამოყენება:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, fuzzy, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr ""
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr ""
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1621,7 +1350,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
@@ -1631,70 +1360,70 @@ msgstr "ერთერთი შემდეგი პაკეტი საჭ
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
@@ -1786,6 +1515,12 @@ msgstr "  --update       - განახლების კვანძებ�
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1813,83 +1548,357 @@ msgstr "დააჭირეთ Esc ღილაკს ინტერაქტ
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "უცნობი მდგომარეობა"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "უცნობი მდგომარეობა"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, 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] "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "უცნობი მდგომარეობა"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "ვაგდებ მედიას \"%s\""
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (ხ/ა) [ხ] "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "ვიღებ შეცვლად მოწყობილობას როგორც \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "შესვლა ვერ განხორციელდა"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "შესვლა ვერ განხორციელდა"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"mdkupdate ვერსია %s\n"
+"საავტორო უფლებები (C) %s Mandriva.\n"
+"პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
+"თანახმად გავრცელება.\n"
+"\n"
+"გამოყენება:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - განახლების კვანძები\n"
+
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr ""
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr ""
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --update       - განახლების კვანძები\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --update       - განახლების კვანძები\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --update       - განახლების კვანძები\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2203,48 +2212,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "ავტომატური ინსტალირება"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "ავტომატური ინსტალირება"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "თქვენი არჩევანი? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2252,7 +2256,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2260,38 +2264,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "საინსტალაციო სერვერის კონფიგურირება"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (ხ/ა) [ხ] "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2299,7 +2303,7 @@ msgid ""
 "%s\n"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2307,12 +2311,12 @@ msgid ""
 "%s\n"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2320,44 +2324,44 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "გამოქცევა"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
@@ -2776,29 +2780,29 @@ msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "ვაგდებ მედიას \"%s\""
diff --git a/po/ko.po b/po/ko.po
index 02b853f2..6fc14bfe 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2007-09-26 20:03+0200\n"
 "Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "설치 준비중입니다"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Error: %s 파일을 찾을 수 없습니다. 작업을 취소합니다. "
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "확인 (_O)"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 "어떻하시겠습니까?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -68,7 +68,7 @@ msgstr ""
 "\n"
 "계속 진행하시겠습니까?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -83,22 +83,22 @@ msgstr ""
 "\n"
 "추후를 위해서 패키지를 저장할 것을 권장합니다. 선택하십시요."
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "설치(_I)"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "취소 (_C)"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, fuzzy, c-format
 msgid "Choose location to save file"
 msgstr "파일 선택"
@@ -194,12 +194,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "선택된 패키지 목록 저장"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "잠시만 기다려 주십시오..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "마우스 포트"
@@ -230,42 +230,42 @@ msgstr ""
 "%s\n"
 "계속 진행하시겠습니까?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "경고"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "확인"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "업그레이드"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "설치 종료"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "패키지 선택"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "다음 패키지들 중 하나가 필요합니다:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "중단(_A)"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -275,55 +275,62 @@ msgstr ""
 "다음 패키지들이 제거될 것입니다.%s\n"
 "계속 설치를 진행하시겠습니까?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "의존성 문제로 인하여, 다음 패키지가 설치되어야 합니다:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "의존성 문제로 인하여, 다음 패키지들이 설치되어야 합니다:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 패키지, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "소스 패키지를 구할 수 없습니다, 설치를 중단합니다."
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, fuzzy, c-format
 msgid "Preparing..."
 msgstr "부트 로더 준비중"
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "패키지 설치 중: [%s] (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "패키지 내려받는 중: [%s] (%s/%s)..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "FAT크기조정 실패: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "완료"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -334,28 +341,27 @@ msgstr ""
 "%s\n"
 "urpmi 데이터베이스를 업데이트해야 할 수도 있습니다."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "설치 실패."
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "모든 것이 이미 설치되어 있습니다."
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "설치 완료"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "%s 제거 중"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -431,58 +437,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb를 열 수 없습니다.\n"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "유효하지 않은 RPM 파일 이름 [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "유효하지 않은 RPM 파일 이름 [%s]"
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, fuzzy, c-format
 msgid "...retrieving done"
 msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "FAT크기조정 실패: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "rpm [%s] 와 맞지 않는 구조"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "패키지 등록 오류"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "이 작업은 제한모드에서 작동되는 동안 금지됩니다."
@@ -522,22 +522,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 디렉토리가 존재하지 않습니다."
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s 없이 %s를 사용할 수 없습니다."
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s 와 함께 %s를 사용할 수 없습니다."
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "너무 많은 인수.\n"
@@ -629,84 +629,89 @@ msgstr "%s 실패: %d 신호에 의하여 종료됨"
 msgid "%s failed: exited with %d"
 msgstr "%s 실패: %d 에 의하여 종료됨"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "로그인에 실패했습니다"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "wget이 없음"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "curl이 없음"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 실패: 다운로드 취소\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync가 없음\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh가 없음\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla가 없음\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "prozilla를 실행할수 없음\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "prozilla가 없음\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "       %s%% of %s 완료됨, ETA = %s, speed = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 완료됨, speed = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "%s 검색 중"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "%s 검색되었음"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, fuzzy, c-format
 msgid "unknown protocol defined for %s"
 msgstr "알 수 없는 파일 타입: %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 "웹패치를 발견하지 못했습니다, 지원하는 웹패치는 :\n"
 "%s 입니다.\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
@@ -728,58 +733,58 @@ msgstr "패키지 %s를 찾을 수 없습니다."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "%s 설치 보고서 생성(제거=%d, 설치=%d, 업그레이드=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "보고서를 생성할 수 없습니다."
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "소스 패키지를 가져올 수 없습니다."
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "패키지 설치중 문제 발생 %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "%s 설치 중...\n"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "FAT크기조정 실패: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "%s 패키지 설치중"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "%s 패키지 설치중"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "%s 설치 중...\n"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "추가 패키지 정보..."
@@ -824,75 +829,80 @@ msgstr "경고"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "설치 실패."
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "설치 실패."
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "다음 팩키지들이 설치될 것입니다."
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "다음 팩키지들이 설치될 것입니다."
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "이 버튼을 누르시겠습니까?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "%s 설치 중...\n"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "%s 설치 중...\n"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "%s 설치 중...\n"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "%s 설치 중...\n"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "의존성 검사없이 설치합니까? (y/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "설치를 강제 추진합니까? (y/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "설치 문제"
@@ -1094,7 +1104,7 @@ msgstr "[%s]의 복사 실패 (파일이 의심되게 적습니다.)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "검색된 소스 hdlist(또는 synthesis)의 md5sum 계산중."
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] 복사 실패(부적절한 md5sum)"
@@ -1134,32 +1144,32 @@ msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "[%s] 추출 중"
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "프린터 「%s」 제거 중 ..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "매체 교환"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1174,94 +1184,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn아니오"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy예"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (Y/n) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "선택이 잘못되었습니다. 다시 시도하세요.\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "패키지 선택"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "검색"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "%s 제거 중"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1343,292 +1358,6 @@ msgstr "%s 마운트 중"
 msgid "unmounting %s"
 msgstr "%s 마운트 해제 중"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf 버전 %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
-"\n"
-"사용법: urpmf [options] pattern-expression\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version        - 이 도구의 버전을 프린트합니다..\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root     - urpmi 데이터베이스 및 rpm 설치를 위해 다른 root사용\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr ""
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "K콘솔 설정 모듈"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr ""
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1645,7 +1374,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "%s라는 팩키지는 없습니다."
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
@@ -1655,66 +1384,66 @@ msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "[%s] 팩키지를 설치할 수 없습니다."
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "모든 것이 이미 설치되어 있습니다."
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "모든 것이 이미 설치되어 있습니다."
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "%s가 없기 때문입니다."
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "모든 것이 이미 설치되어 있습니다."
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, fuzzy, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s에 만족하지 않기 때문입니다."
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "%s 활성화 시도중"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "%s를 유지하기 위해"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr "다음 팩키지들이 제거될 것입니다."
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "다음 팩키지들이 제거될 것입니다."
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "%s를 설치하기 위해"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "%s와 충돌하기 때문"
@@ -1805,6 +1534,13 @@ msgstr "  --repackage     - 삭제전에 파일을 Re-package\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root          - Rpm 제거를 위해 다른 root사용\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root     - urpmi 데이터베이스 및 rpm 설치를 위해 다른 root사용\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1834,38 +1570,38 @@ msgstr "  --verbose, -v    - 상세 정보 모드.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr " -a           - 조건과 매칭되는 모든 패키지 선택\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "오직 superuser만 패키지를 제거할 수 있습니다."
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "알수 없는 패키지"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "알수 없는 패키지"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "%s패키지를 제거하면 시스템이 깨질 수 있습니다."
 
-#: ../urpme:126
+#: ../urpme:128
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "제거할 태그 없음!"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "제거할 태그 없음!"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1875,43 +1611,316 @@ msgstr[0] ""
 "제거될 것입니다..\n"
 "\n"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "알수 없는 패키지"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%d 패키지를 제거하시겠습니까?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (Y/n) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "탈착식 장치"
 
-#: ../urpme:181
+#: ../urpme:185
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "제거 실패"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "제거 실패"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf 버전 %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
+"\n"
+"사용법: urpmf [options] pattern-expression\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version        - 이 도구의 버전을 프린트합니다..\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "K콘솔 설정 모듈"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr ""
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2227,36 +2236,31 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "업그레이드"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "업그레이드"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "설치 종료"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "설치 종료"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2266,12 +2270,12 @@ msgstr ""
 "설치되어야 합니다.\n"
 "\n"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "어느 것을 선택하시겠습니까? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2279,7 +2283,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2287,7 +2291,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2296,31 +2300,31 @@ msgstr ""
 "\n"
 "계속하시겠습니까?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr "일부 팩키지는 제거되어야 합니다."
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr "일부 팩키지는 제거되어야 합니다."
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s패키지를 제거하면 시스템이 깨질 수 있습니다."
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2330,7 +2334,7 @@ msgstr ""
 "업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
 "되지 않습니다.\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2340,12 +2344,12 @@ msgstr ""
 "업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
 "되지 않습니다.\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2353,7 +2357,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2362,38 +2366,38 @@ msgstr[0] ""
 "제거될 것입니다..\n"
 "\n"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "취소"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "다 되었으면 ENTER키를 누르세요..."
@@ -2825,14 +2829,14 @@ msgstr "  -v             - 상세 정보 모드.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "업데이트할 것이 없습니다. (미디어를 추가하려면 「urpmi.addmedia」를 사용하세"
 "요.\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2841,17 +2845,17 @@ msgstr ""
 "업데이트하려는 항목이 빠져있습니다.\n"
 "(%s 중 하나)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "존재하지 않는 매체「%s」의 제거 시도"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "존재하지 않는 매체「%s」의 제거 시도"
diff --git a/po/ky.po b/po/ky.po
index a0bfa0e5..67ab74b4 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-07-13 13:23+0000\n"
 "Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
 "Language-Team: Kyrgyz\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM орнотуу"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 "Эмнени кылууну каалайсыз?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -68,7 +68,7 @@ msgstr ""
 "\n"
 "Уланталыбы?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -83,22 +83,22 @@ msgstr ""
 "\n"
 "Сиз аны жөн гана сактап алсаңыз болот. Сиздин тандооңуз?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Орнотуу"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Сактоо"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Калтыруу"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Сактоо үчүн орун тандаңыз"
@@ -204,12 +204,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "%s аттуу пакет жок"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Күтө туруңуз..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "root укуктары талап кылынат"
@@ -240,42 +240,42 @@ msgstr ""
 "%s\n"
 "Уланталыбы?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Эскертүү"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (жаңылоо)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (орнотуу)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Пакет тандоо"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Төмөнкү пакеттердин бири талап кылынат:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Токтотуу"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -286,14 +286,14 @@ msgstr ""
 "%s\n"
 "Уланталыбы?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Көз карандылыктарды канаатандыруу үчүн, төмөнкү пакет орнотулат (%d Мб)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -301,44 +301,51 @@ msgstr ""
 "Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат:\n"
 "%s\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "баштапкы пакеттерди алууга болбоду, күтүлбөгөн аяктоо"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Даярдоо ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "\"%s\" аттуу булагын [%s] түзүлүшүнө орнотуңуз"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' пакети жүктөлүүдө..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...кабыл алуу ийгиликсиз: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Даяр"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -349,28 +356,27 @@ msgstr ""
 "%s\n"
 "Мүмкүн сизге urpmi берилиштер базасын жаңылоо керек"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Орнотуу ишке ашпады"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Бардыгы алдагачан орнотулган"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Орнотуу аяктады"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s алынып салынууда"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi кайра ишке киргизилүүдө"
@@ -444,58 +450,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "%s үчүн спецификалык чөйрө колдонулууда\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb ачууга болбоду"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "[%s] туура эмес rpm файл аты"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "[%s] rpm файлы кабыл алынууда..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...кабыл алуу аяктады"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...кабыл алуу ийгиликсиз: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "[%s] rpm файлына жетүүгө болбоду"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "\"%s\" түшүнүүгө болбоду; ал [%s] файлынын ичинде"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm файлын каттого болбоду"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "локалдык пакеттерди каттоо катасы"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Чектелген режим учурунда бул операцияны аткарууга болбойт"
@@ -535,22 +535,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -642,82 +642,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Көчүрүү ишке ашпады"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "%s жоктугунан"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "%s жоктугунан"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "%s жоктугунан"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "%s алынып салынууда"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...кабыл алуу ийгиликсиз: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s үчүн белгисиз протокол берилген"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch табылбады, колдоого ээ webfetch: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "протокол аткарылбады: %s"
@@ -737,12 +742,12 @@ msgstr "%s пакети табылбады."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rpm файлдарын \"%s\" булагынан кабыл алуу жүрүп жатат..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -750,47 +755,47 @@ msgstr ""
 "%s ичине инсталляциялоо үчүн транзакция түзүлдү (remove=%d, install=%d, "
 "upgrade=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "транзакция түзүүгө мүмкүн эмес"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "%s дельта-rpm пакетинен rpm-ди чыгаруугу мүмкүн эмес"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s пакетин орнотуу мүмкүн эмес"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "%2s булагынан %1s орнотулууда"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...кабыл алуу ийгиликсиз: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "%s пакети алынып салынууда"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "%s пакети алынып салынууда"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "%2s булагынан %1s орнотулууда"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "%s пакети жөнүндө кеңирээк маалымат"
@@ -835,75 +840,80 @@ msgstr "Эскертүү"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Орнотуу ишке ашпады"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Орнотуу ишке ашпады"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Орнотууну улантууну каалайсызбы ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "%2s булагынан %1s орнотулууда"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "%s бөлүштүрүлүүдө"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "%2s булагынан %1s орнотулууда"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s орнотулууда"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Көз карадылыктарды эске албай орнотуп көрөйүнбү? (y/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Мажбурлап орнотуп көрөйүнбү (--force)? (y/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Орнотууга мүмкүн"
@@ -1108,7 +1118,7 @@ msgstr "[%s] көчүрүү ишке ашпады (файл күмөндүү к�
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "кабыл алынган баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr " [%s] көчүрүү ишке ашпады (md5sum туура эмес)"
@@ -1148,32 +1158,32 @@ msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" булагынын баштапкы hdlist (же synthesis) кабыл алынууда..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" үчүн ачык ачкыч файлы текшерилүүдө..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%s ачкычы \"%s\" ачык ачкычынан импорттолду"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" ачык ачкыч файлын импортоо мүмкүн эмес"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "%s булагы кошулду"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1188,94 +1198,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "[%s] булагынын rpm файлдары окулууда"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "NnжЖ;:"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyоО"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Кечириңиз, туура эмес тандоо, кайталап көрүңүз\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "Пакет тандоо"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Издөө"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "\"%s\" булагы алынып салынууда"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1358,302 +1373,6 @@ msgstr "%s бириктирилүүдө"
 msgid "unmounting %s"
 msgstr "%s ажыратылууда"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf версиясы %s\n"
-"Copyright (C) 2002-2004 Mandriva.\n"
-"Бул эркин программалык жабдуу жана аны GNU GPL\n"
-"шартынын негизинде таркатууга болот.\n"
-"\n"
-"колдонулушу:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - бул жардамды чыгаруу.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - спецификалык чөйрөнү колдонуу (демейде ката жөнүндө "
-"отчет).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - үтүр менен бөлүнөп көрсөтүлгөн булактарды колдонбоо.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - орнотуу үчүн башка түп колдонуу.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - үтүр менен бөлүнгөп саптарга ылайык булактарды сорттоо.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - бирдей саптарды чыгарбоо.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - жаңылоо булагын гана колдонуу.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - кеңири режим.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - бардык шаблондордогу регистрлердин айырмаларын эске "
-"албоо.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - бардык шаблондордогу регистрлердин айырмаларын эске "
-"албоо.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - түздөн түз perl кодун perl -e сыяктуу кошуу.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - бинардык AND оператору.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - бинардык OR оператору.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - унардык NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - оң кашаа, туюнтмалардын группасын жабат.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - X интерфейсин колдонуу.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    алдыалынганы %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - url: url тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - buildhost: түзүүчү хост тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Konsole конфигурациялоо модулу"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - conflicts: бардык конфликтер тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - description: баяны тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epoch: epoch тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name          - пакет ысымдарын гана чыгаруу.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - пакеттеги файлдар тизмеси.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - group: группа тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name          - пакет ысымдарын гана чыгаруу.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name          - пакет ысымдарын гана чыгаруу.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - packager: пакеттөөчү тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - provides: бардык берилчү файлдар тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - requires: бардык көз карандылыктар тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - size: өлчөмү тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - sourcerpm: баштапкы rpm тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - жалпы маалымат тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url: url тэгин чыгаруу.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - кеңири режим.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - пакеттеги файлдар тизмеси.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - версиясын, релизин жана архитектурасын аттары менен кошо "
-"чыгаруу.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1670,7 +1389,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "%s аттуу пакет жок"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Төмөнкү пакеттер %s камтыйт: %s"
@@ -1680,47 +1399,47 @@ msgstr "Төмөнкү пакеттер %s камтыйт: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Бардыгы алдагачан орнотулган"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Бардыгы алдагачан орнотулган"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Бардыгы алдагачан орнотулган"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "%s жоктугунан"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Бардыгы алдагачан орнотулган"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s канаатанбагандыгынан"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s активдештирүү аракети"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s сактоо үчүн"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1729,7 +1448,7 @@ msgstr ""
 "Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1738,12 +1457,12 @@ msgstr ""
 "Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s орнотуу үчүн"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s менен конфликтешкендиги үчүн"
@@ -1836,6 +1555,12 @@ msgstr "  --packager     - packager: пакеттөөчү тэгин чыгар�
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - rpm өчүрүү үчүн башка түп колдонуу.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - орнотуу үчүн башка түп колдонуу.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1866,39 +1591,39 @@ msgstr "  --verbose      - кеңири режим.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - туюнтмага туура келген бардык пакеттерди тандоо.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Суперколдонуучу гана пакеттерди жогото алат"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "белгисиз пакеттер"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "белгисиз пакет"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
 msgstr[1] "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Алып салууга эч нерсе жок"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Алып салууга эч нерсе жок"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1908,45 +1633,329 @@ msgstr[0] ""
 msgstr[1] ""
 "Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "белгисиз пакет"
 msgstr[1] "белгисиз пакет"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%s пакети алынып салынууда"
 msgstr[1] "%s пакети алынып салынууда"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "чыгарылып алынуучу түзүлүш \"%s\" катары каралууда"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Алып салуу ишке ашпады"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Алып салуу ишке ашпады"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf версиясы %s\n"
+"Copyright (C) 2002-2004 Mandriva.\n"
+"Бул эркин программалык жабдуу жана аны GNU GPL\n"
+"шартынын негизинде таркатууга болот.\n"
+"\n"
+"колдонулушу:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - бул жардамды чыгаруу.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - спецификалык чөйрөнү колдонуу (демейде ката жөнүндө "
+"отчет).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - үтүр менен бөлүнөп көрсөтүлгөн булактарды колдонбоо.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - үтүр менен бөлүнгөп саптарга ылайык булактарды сорттоо.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - бирдей саптарды чыгарбоо.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - жаңылоо булагын гана колдонуу.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - кеңири режим.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - бардык шаблондордогу регистрлердин айырмаларын эске "
+"албоо.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - бардык шаблондордогу регистрлердин айырмаларын эске "
+"албоо.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - түздөн түз perl кодун perl -e сыяктуу кошуу.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - бинардык AND оператору.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - бинардык OR оператору.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - унардык NOT.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - оң кашаа, туюнтмалардын группасын жабат.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - X интерфейсин колдонуу.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    алдыалынганы %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - url: url тэгин чыгаруу.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - buildhost: түзүүчү хост тэгин чыгаруу.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Konsole конфигурациялоо модулу"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - conflicts: бардык конфликтер тэгин чыгаруу.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - description: баяны тэгин чыгаруу.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epoch: epoch тэгин чыгаруу.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name          - пакет ысымдарын гана чыгаруу.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - пакеттеги файлдар тизмеси.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - group: группа тэгин чыгаруу.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name          - пакет ысымдарын гана чыгаруу.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - пакет ысымдарын гана чыгаруу.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - packager: пакеттөөчү тэгин чыгаруу.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - provides: бардык берилчү файлдар тэгин чыгаруу.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - requires: бардык көз карандылыктар тэгин чыгаруу.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - size: өлчөмү тэгин чыгаруу.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - sourcerpm: баштапкы rpm тэгин чыгаруу.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - жалпы маалымат тэгин чыгаруу.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url: url тэгин чыгаруу.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - кеңири режим.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - пакеттеги файлдар тизмеси.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - версиясын, релизин жана архитектурасын аттары менен кошо "
+"чыгаруу.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2296,36 +2305,31 @@ msgstr ""
 "Ката:мүмкүн %s окуу үчүн гана колдонулган.\n"
 " --allow-force операцияны чакыруу үчүн колдонуу."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (жаңылоо)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (жаңылоо)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (орнотуу)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (орнотуу)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2333,12 +2337,12 @@ msgid ""
 msgstr ""
 "Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Сиздин тандооңуз? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2349,7 +2353,7 @@ msgstr ""
 "каранды:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2360,19 +2364,19 @@ msgstr ""
 "каранды:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Буга карабай улантайынбы?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2381,7 +2385,7 @@ msgstr ""
 "Талап кылынган кээ бир пакеттерди орноттууга болбойт:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2390,12 +2394,12 @@ msgstr ""
 "Талап кылынган кээ бир пакеттерди орноттууга болбойт:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2406,7 +2410,7 @@ msgstr ""
 "үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
 ",%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2417,12 +2421,12 @@ msgstr ""
 "үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
 ",%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2432,7 +2436,7 @@ msgstr ""
 "Төмөнкү көз карандылыктарды орнотуу үчүн сиз root болушуңуз керек:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2441,39 +2445,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Калтыруу"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Даяр болгон соң, Enter басыңыз..."
@@ -2919,12 +2923,12 @@ msgstr "  -f             - hdlist файлдардын түзүүгө мажбу
 msgid "Only superuser is allowed to update media"
 msgstr "Суперколдонуучу гана пакет булактарын жаңылай алат"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "жаңылоого эч нерсе жок (булак кошуу үчүн urpmi.addmedia колдонуңуз)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2933,17 +2937,17 @@ msgstr ""
 "жаңылоо үчүн пунк жок\n"
 "(%s ичинен бири)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "%s булагы оңдолууда:"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "%s булагы иштөөдө"
diff --git a/po/lt.po b/po/lt.po
index 940e3aee..675cb593 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-08-18 23:34+0200\n"
 "Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM įdiegimas"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Gerai"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "Ką jūs darysite?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "Tęsti?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -86,22 +86,22 @@ msgstr ""
 "\n"
 "Jūs galite tiesiog jį išsaugoti. Koks jūsų pasirinkimas?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "Į_diegti"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "Iš_saugoti"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Atšaukti"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Pasirinkite vietą bylos išsaugojimui"
@@ -206,12 +206,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Išsaugoti paketų pasirinkimą"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Palaukite..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Turi būti pradinis"
@@ -242,42 +242,42 @@ msgstr ""
 "%s\n"
 "Tęsti?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Dėmesio"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Gerai"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (atnaujinti)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (įdiegti)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Paketų pasirinkimas"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vienas iš šių paketų yra reikalingas."
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Nutraukti"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -288,19 +288,19 @@ msgstr ""
 "%s\n"
 "Tęsti?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -308,37 +308,44 @@ msgstr[0] "%d paketų"
 msgstr[1] "%d paketų"
 msgstr[2] "%d paketų"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "negaliu gauti pirminių paketų, nutraukiu"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Ruošiamasi..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Įdėkite laikmeną, pavadintą \"%s\", į įrenginį [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Parsiunčiamas paketas `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...atkūrimas nepavyko: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "Baigta"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -349,28 +356,27 @@ msgstr ""
 "%s\n"
 "Jūs galite norėti atnaujinti urpmi duomenų bazę"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Įdiegimas nepavyko"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Paketas(-ai) jau įdiegti"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Įdiegimas baigtas"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "pašalinama %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "iš naujo paleidžiama urpmi"
@@ -444,58 +450,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "%s naudojama specifinė aplinka\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "negaliu atverti rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "netinkamas rpm bylos vardas [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "atkuriama rpm byla [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...atkūrimas baigtas"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...atkūrimas nepavyko: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "negaliu prieiti prie rpm bylos [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "negaliu išnagrinėti \"%s\" byloje [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "negaliu įregistruoti rpm bylos"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "vietinių paketų registravimo klaida"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Operacija yra draudžiama, kai dirbama apribotoje veiksenoje"
@@ -535,22 +535,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -642,82 +642,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Kopijavimas nepavyko"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "dėl trūkstamo %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "dėl trūkstamo %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "dėl trūkstamo %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "pašalinama %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...atkūrimas nepavyko: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s nurodytas nežinomas protokolas"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nerasta webfetch, palaikomi webfetch yra: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "negaliu valdyti protokolo: %s"
@@ -737,59 +742,59 @@ msgstr "paketas %s nerastas."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rpm bylos atkuriamos iš laikmenos \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "sukurta įdiegimo operacija %s (pašalinti=%d, įdiegti=%d, atnaujinti=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "negaliu sukurti operacijos"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "iš delta-rpm paketo %s negaliu išarchyvuoti rpm"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "negaliu įdiegti paketo %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "iš %2$s įdiegiamas %1$s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...atkūrimas nepavyko: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "pašalinamas paketas %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "pašalinamas paketas %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "iš %2$s įdiegiamas %1$s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Daugiau informacijos apie paketą %s"
@@ -834,75 +839,80 @@ msgstr "Dėmesio"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Įdiegimas nepavyko"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Įdiegimas nepavyko"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Šie paketai turi netinkamus ženklus"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Šie paketai turi netinkamus ženklus"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ar norite tęsti įdiegimą ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "iš %2$s įdiegiamas %1$s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "paskirstomas %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "iš %2$s įdiegiamas %1$s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "įdiegiama %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Įdiegimas galimas"
@@ -1107,7 +1117,7 @@ msgstr "[%s] kopijavimas nepavyko (byla per daug maža)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "atkurtam hdlist (arba sintezei) skaičiuojama md5sum"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] kopijavimas nepavyko (md5sum neatitikimas)"
@@ -1147,32 +1157,32 @@ msgstr "laikmenai \"%s\" nerasta hdlist byla"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "atkuriamas \"%s\" pirminis hdlist (arba zintezė)..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "tikrinama \"%s\" pubkey byla..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...iš \"%2$s\" pubkey bylos importuotas raktas %1$s"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "negaliu importuoti \"%s\" pubkey bylos"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "laikmenai \"%s\" nerasta hdlist byla"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "įtraukta laikmena %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1187,94 +1197,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "iš [%s] skaitomos rpm bylos"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "TtYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (t/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Gaila, bet pasirinkimas blogas, pakartokite\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "Paketų pasirinkimas"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Ieškoti"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "pašalinama laikmena \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1358,304 +1373,6 @@ msgstr "prijungiama %s"
 msgid "unmounting %s"
 msgstr "atjungiama %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf versija %s\n"
-"Autorinės teisės (C) 2002-2004 Mandriva.\n"
-"Tai yra nemokama programa, kuri gali būti platinama pagal GNU GPL "
-"licenciją.\n"
-"\n"
-"naudojimas:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - spausdinti šį pagalbos pranešimą.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - naudoti specifinę aplinką (paprastai klaidos "
-"pranešimas).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - nenaudoti duotųjų laikmenų, atskirtų kableliu.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - rpm įdiegimui naudokite kitą pradinį.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - rikiuoti laikmenas pagal papildomas eilutes, atskirtas "
-"kableliu.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - vietoje urpmi duomenų bazės naudokite duotąją sintezę.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - vietoje urpmi duomenų bazės naudokite duotąją sintezę.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - nespausdinti identiškų eilučių.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - naudoti tik atnaujinimo laikmeną.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose veiksena.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignoruoti kiekvieno pavyzdžio raidžių dydžio skirtumus.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - ignoruoti kiekvieno pavyzdžio raidžių dydžio skirtumus.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - perl kodą įtraukti tiesiogiai kaip perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - dvejetainis IR operatorius.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - dvejetainis ARBA operatorius.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - elementas NE.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  )              - dešinysis skliaustelis grupės išraiskos uždarymui.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  -g             - spausdinti grupes kartu su pavadinimu.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    standartinis yra %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - spausdinti žymens url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - spausdinti žymens buildhost: build host.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "taikyti konfigūracijos bylos pakeitimus"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - spausdinti žymenų konfliktus: visi konfliktai.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - spausdinti žymens aprašymą: aprašymas.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - spausdinti žymenų laikotarpį: laikotarpis.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - spausdinti tik paketų pavadinimus.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - paketo bylas sudėti į sąrašą.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - spausdinti žymenų grupę: grupė.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - spausdinti tik paketų pavadinimus.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - spausdinti tik paketų pavadinimus.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - spausdinti pasenusius žymenis: visi pasenę.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - spausdinti žymens archyvatorių: archyvatorius.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - spausdinti: all provides.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-"  --requires     - spausdinti žymenų pareikalavimus: visi pareikalavimai.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - spausdinti žymenų dydį: dydis.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - spausdinti žymens pirminį rpm: pirminis rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - spausdinti pasenusius žymenis: visi pasenę.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - spausdinti suvestinę.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - spausdinti žymens url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - verbose veiksena.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - paketo bylas sudėti į sąrašą.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - spausdinimo versija, išleisti ir archyvuoti su "
-"pavadinimu.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "laikmenai \"%s\" nerasta hdlist byla"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "\"%s\" laikmenai sudaryta hdlist sintezės byla"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1672,7 +1389,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nėra paketo, pavadinto %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Šie paketai turi %s: %s"
@@ -1682,47 +1399,47 @@ msgstr "Šie paketai turi %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Paketas(-ai) jau įdiegti"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Paketas(-ai) jau įdiegti"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketas(-ai) jau įdiegti"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "dėl trūkstamo %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Paketas(-ai) jau įdiegti"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "dėl nepatenkinto %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "bandau paaukštinti %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s išlaikymui"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1731,7 +1448,7 @@ msgstr ""
 "Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1740,12 +1457,12 @@ msgstr ""
 "Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s įdiegimui"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "dėl konfliktų su %s"
@@ -1839,6 +1556,12 @@ msgstr "  --packager     - spausdinti žymens archyvatorių: archyvatorius.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - naudokite kitą pradinį (root) rpm pašalinimui.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - rpm įdiegimui naudokite kitą pradinį.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1869,22 +1592,22 @@ msgstr "  --verbose      - verbose veiksena.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - išrinkti visus paketus, atitinkančius išraišką.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Paketus pašalinti gali tik supervartotojas"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "nežinomi paketai"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "nežinomas paketas"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1892,17 +1615,17 @@ msgstr[0] "paketo %s pašalinimas sugadins jūsų sistemą"
 msgstr[1] "paketo %s pašalinimas sugadins jūsų sistemą"
 msgstr[2] "paketo %s pašalinimas sugadins jūsų sistemą"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nėra ką pašalinti"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nėra ką pašalinti"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1911,7 +1634,7 @@ msgstr[0] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
 msgstr[1] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
 msgstr[2] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1919,7 +1642,7 @@ msgstr[0] "nežinomas paketas"
 msgstr[1] "nežinomas paketas"
 msgstr[2] "nežinomas paketas"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1927,31 +1650,317 @@ msgstr[0] "pašalinamas paketas %s"
 msgstr[1] "pašalinamas paketas %s"
 msgstr[2] "pašalinamas paketas %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (t/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "išimamas įrenginys priimamas kaip \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Pašalinimas nepavyko"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Pašalinimas nepavyko"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf versija %s\n"
+"Autorinės teisės (C) 2002-2004 Mandriva.\n"
+"Tai yra nemokama programa, kuri gali būti platinama pagal GNU GPL "
+"licenciją.\n"
+"\n"
+"naudojimas:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - spausdinti šį pagalbos pranešimą.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - naudoti specifinę aplinką (paprastai klaidos "
+"pranešimas).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - nenaudoti duotųjų laikmenų, atskirtų kableliu.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - rikiuoti laikmenas pagal papildomas eilutes, atskirtas "
+"kableliu.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - vietoje urpmi duomenų bazės naudokite duotąją sintezę.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - vietoje urpmi duomenų bazės naudokite duotąją sintezę.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - nespausdinti identiškų eilučių.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - naudoti tik atnaujinimo laikmeną.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose veiksena.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignoruoti kiekvieno pavyzdžio raidžių dydžio skirtumus.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - ignoruoti kiekvieno pavyzdžio raidžių dydžio skirtumus.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - perl kodą įtraukti tiesiogiai kaip perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - dvejetainis IR operatorius.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - dvejetainis ARBA operatorius.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - elementas NE.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  )              - dešinysis skliaustelis grupės išraiskos uždarymui.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  -g             - spausdinti grupes kartu su pavadinimu.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    standartinis yra %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - spausdinti žymens url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - spausdinti žymens buildhost: build host.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "taikyti konfigūracijos bylos pakeitimus"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - spausdinti žymenų konfliktus: visi konfliktai.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - spausdinti žymens aprašymą: aprašymas.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - spausdinti žymenų laikotarpį: laikotarpis.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - spausdinti tik paketų pavadinimus.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - paketo bylas sudėti į sąrašą.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - spausdinti žymenų grupę: grupė.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - spausdinti tik paketų pavadinimus.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - spausdinti tik paketų pavadinimus.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - spausdinti pasenusius žymenis: visi pasenę.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - spausdinti žymens archyvatorių: archyvatorius.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - spausdinti: all provides.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+"  --requires     - spausdinti žymenų pareikalavimus: visi pareikalavimai.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - spausdinti žymenų dydį: dydis.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - spausdinti žymens pirminį rpm: pirminis rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - spausdinti pasenusius žymenis: visi pasenę.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - spausdinti suvestinę.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - spausdinti žymens url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - verbose veiksena.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - paketo bylas sudėti į sąrašą.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - spausdinimo versija, išleisti ir archyvuoti su "
+"pavadinimu.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "laikmenai \"%s\" nerasta hdlist byla"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "\"%s\" laikmenai sudaryta hdlist sintezės byla"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2304,48 +2313,43 @@ msgstr ""
 "Klaida: %s prijungta tik skaitymui.\n"
 "Operacijos vykdymui naudokite --allow-force"
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (atnaujinti)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (atnaujinti)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (įdiegti)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (įdiegti)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Koks Jūsų pasirinkimas? (1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2356,7 +2360,7 @@ msgstr ""
 "kurie yra senesni nei dabar įdiegti:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2367,19 +2371,19 @@ msgstr ""
 "kurie yra senesni nei dabar įdiegti:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Ar vis tiek tęsti?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2388,7 +2392,7 @@ msgstr ""
 "Pareikalautas paketas negali būti įdiegtas:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2397,12 +2401,12 @@ msgstr ""
 "Pareikalautas paketas negali būti įdiegtas:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketo %s pašalinimas sugadins jūsų sistemą"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2413,7 +2417,7 @@ msgstr ""
 "turi būti pašalinti, kad kitus būtų galima atnaujinti:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2424,12 +2428,12 @@ msgstr ""
 "turi būti pašalinti, kad kitus būtų galima atnaujinti:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2439,7 +2443,7 @@ msgstr ""
 "Išvardintų priklausomybių įdiegimiui jūs turite būti pradiniu:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2447,27 +2451,27 @@ msgstr[0] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
 msgstr[1] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
 msgstr[2] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2475,12 +2479,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Kai būsite pasiruošę, paspauskite Enter..."
@@ -2925,12 +2929,12 @@ msgstr "  -f             - vykdyti hdlist bylų sudarymą.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Atnaujinti laikmenas gali tik supervartotojas"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nėra ką atnaujinti (laikmenos pridėjimui naudokite urpmi.addmedia)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2939,17 +2943,17 @@ msgstr ""
 "atnaujintino įrašo nėra\n"
 "(vienas iš %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignoruojama laikmena %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "įgalinama laikmena %s"
diff --git a/po/lv.po b/po/lv.po
index c916fd99..dfb57417 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2002-09-27 17:43+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -21,22 +21,22 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Sagatavoju instalēšanu"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Labi"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -49,7 +49,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -61,7 +61,7 @@ msgstr ""
 "Jums jābūt root, lai instalētu sekojošas atkarības:\n"
 "%s\n"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -71,22 +71,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Uzstādīt"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Saglabāt"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, fuzzy, c-format
 msgid "Choose location to save file"
 msgstr "Izvēlieties failu"
@@ -183,12 +183,12 @@ msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 msgid "No packages specified"
 msgstr "Saglabāt pakotņu izvēli"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Lūdzu gaidiet..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Peles ports"
@@ -219,42 +219,42 @@ msgstr ""
 "%s\n"
 "vai piekrītat?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Uzmanību"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Atjaunināt"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Instalēšanas beigas"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Pārtraukt"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -262,19 +262,19 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Tiks noņemtas sekojošas pakotnes"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -282,37 +282,44 @@ msgstr[0] "%d pakotnes"
 msgstr[1] "%d pakotnes"
 msgstr[2] "%d pakotnes"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nevar dabūt koda pakotnes, pārtraucu"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Sagatavoju..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, fuzzy, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalēju pakotnes..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Instalēju pakotnes..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...atgūšana neizdevās: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Izdarīts"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -320,28 +327,27 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalēšana neizdevās"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "viss jau ir instalēts"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalēšana pabeigta"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Atvienoju %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -417,58 +423,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "Nevar atvērt failu %s\n"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nederīgs rpm faila vārds [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "atgūstu hdlists failu..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...atgūšana veikta"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...atgūšana neizdevās: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "kļūda reģistrējot lokālās pakotnes"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -508,22 +508,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -615,82 +615,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Neveiksmīga Pieteikšanās"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "trūkstošs kdesu"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "trūkstošs kdesu"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "trūkstošs kdesu"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "Atvienoju %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...atgūšana neizdevās: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "Nezināms protokols definēts priekš %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nav iespējams lietot paralēlo opciju \"%s\""
@@ -710,58 +715,58 @@ msgstr "pakotne %s nav atrasta."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "Neizdevās izveidot ssh identitāti"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "nevaru instalēt pakotni %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "tiek instalēta %s\n"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...atgūšana neizdevās: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "Instalēju pakotni %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "Instalēju pakotni %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tiek instalēta %s\n"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Vairāk informācijas par pakotni..."
@@ -806,75 +811,80 @@ msgstr "Uzmanību"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalēšana neizdevās"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Instalēšana neizdevās"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Sekojošām pakotnēm ir slikti paraksti"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sekojošām pakotnēm ir slikti paraksti"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Vēlaties turpināt instalēšanu?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "tiek instalēta %s\n"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "tiek instalēta %s\n"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "tiek instalēta %s\n"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "tiek instalēta %s\n"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Vai mēģināt instalēt bez atkarību pārbaudes? (j/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Vai mēģināt instalēt vēl uzstājīgāk (--force)? (j/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalēšana ir iespējama"
@@ -1078,7 +1088,7 @@ msgstr "[%s] kopēšana neizdevās"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] kopēšana neizdevās"
@@ -1118,32 +1128,32 @@ msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "atgūstu hdlists failu..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "kopēju \"%s\" apraksta failu ..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "pievienoju datu nesēju %s."
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1158,94 +1168,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "nolasu rpm failus no [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "jJYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Atvainojiet, nepareiza izvēle. Mēģiniet vēlreiz\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Meklēt"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "noņemu datu nesēju \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1329,297 +1344,6 @@ msgstr "montēju %s"
 msgid "unmounting %s"
 msgstr "atmontēju %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"mdkupdate versija %s\n"
-"Autortiesības (C) %s Mandriva.\n"
-"Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL noteikumiem.\n"
-"\n"
-"Pielietojums:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --wget         - lietot wget, lai iegūtu attālinātos failus.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, fuzzy, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, fuzzy, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - runīgais režīms.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -q             - klusais režīms.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -q             - klusais režīms.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -q             - klusais režīms.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Atjaunojamo datu saraksts:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - lietot X saskarni.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-"\n"
-"                    DrakBackup ziņojuma detaļas\n"
-"\n"
-"\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --files         - drukāt iezīmi: faili (vairākas rindiņas)."
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Konsoles konfigurācijas modulis"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - drukāt iezīmi: konflikti (vairākas rindiņas)."
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - drukāt iezīmui: apraksts."
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - drukāt iezīmi: nodrošina (vairākas rindiņas)."
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --group         - drukāt iezīmi: grupa."
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - drukāt iezīmi: kopsavilkums."
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -v             - runīgais režīms.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -v             - runīgais režīms.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1636,7 +1360,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nav pakotnes ar nosaukumu %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sekojošas pakotnes satur %s: %s"
@@ -1646,66 +1370,66 @@ msgstr "Sekojošas pakotnes satur %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "viss jau ir instalēts"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "viss jau ir instalēts"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "viss jau ir instalēts"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "trūkstošs kdesu"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "viss jau ir instalēts"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, fuzzy, c-format
 msgid "due to unsatisfied %s"
 msgstr "trūkstošs kdesu"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "Nav nekā, ko noņemt.\n"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Loga rāmja tēma"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Tiks noņemtas sekojošas pakotnes"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Tiks noņemtas sekojošas pakotnes"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "nevaru instalēt pakotni %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "%s konflikē ar %s"
@@ -1797,6 +1521,12 @@ msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --wget         - lietot wget, lai iegūtu attālinātos failus.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --wget         - lietot wget, lai iegūtu attālinātos failus.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1824,22 +1554,22 @@ msgstr "  -v             - runīgais režīms.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Tikai root drīkst instalēt pakotnes"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "%d pakotnes"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "%d pakotnes"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1847,17 +1577,17 @@ msgstr[0] "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
 msgstr[1] "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
 msgstr[2] "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
 
-#: ../urpme:126
+#: ../urpme:128
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Nav iezīmes ko noņemt!"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nav iezīmes ko noņemt!"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1866,7 +1596,7 @@ msgstr[0] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d M
 msgstr[1] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 msgstr[2] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1874,7 +1604,7 @@ msgstr[0] "%d pakotnes"
 msgstr[1] "%d pakotnes"
 msgstr[2] "%d pakotnes"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1882,31 +1612,310 @@ msgstr[0] "Instalēju pakotni %s"
 msgstr[1] "Instalēju pakotni %s"
 msgstr[2] "Instalēju pakotni %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Atvienojama ierīce"
 
-#: ../urpme:181
+#: ../urpme:185
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Neveiksmīga Pieteikšanās"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Neveiksmīga Pieteikšanās"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"mdkupdate versija %s\n"
+"Autortiesības (C) %s Mandriva.\n"
+"Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL noteikumiem.\n"
+"\n"
+"Pielietojums:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, fuzzy, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, fuzzy, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - runīgais režīms.\n"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -q             - klusais režīms.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -q             - klusais režīms.\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -q             - klusais režīms.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Atjaunojamo datu saraksts:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - lietot X saskarni.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+"\n"
+"                    DrakBackup ziņojuma detaļas\n"
+"\n"
+"\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --files         - drukāt iezīmi: faili (vairākas rindiņas)."
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Konsoles konfigurācijas modulis"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - drukāt iezīmi: konflikti (vairākas rindiņas)."
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - drukāt iezīmui: apraksts."
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - drukāt iezīmi: nodrošina (vairākas rindiņas)."
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --group         - drukāt iezīmi: grupa."
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - drukāt iezīmi: kopsavilkums."
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -v             - runīgais režīms.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -v             - runīgais režīms.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2228,48 +2237,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Atjaunināt"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Atjaunināt"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Instalēšanas beigas"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Instalēšanas beigas"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Kāda ir jūsu izvēle? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2277,7 +2281,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2285,38 +2289,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Tad turpināt?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr "Dažas pakotnes nepieciešams noņemt"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr "Dažas pakotnes nepieciešams noņemt"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2327,7 +2331,7 @@ msgstr ""
 "%s\n"
 "vai piekrītat?"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2338,12 +2342,12 @@ msgstr ""
 "%s\n"
 "vai piekrītat?"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2353,7 +2357,7 @@ msgstr ""
 "Jums jābūt root, lai instalētu sekojošas atkarības:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2361,27 +2365,27 @@ msgstr[0] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d M
 msgstr[1] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 msgstr[2] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2389,12 +2393,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Nospiediet Enter, kad gatavs..."
@@ -2830,13 +2834,13 @@ msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Tikai root drīkst instalēt pakotnes"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nav ko atjaunināt (lietojiet urpmi.addmedia, lai pievienotu datu nesēju)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2845,17 +2849,17 @@ msgstr ""
 "atjuninājumā trūkst kāda ieraksta\n"
 "(viens no %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "noņemu datu nesēju \"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "noņemu datu nesēju \"%s\""
diff --git a/po/mk.po b/po/mk.po
index 66b82147..c080e15c 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-07-18 01:58+0200\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: KBabel 1.10.1\n"
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM инсталација"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Во ред"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "Што сакате да направите?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "Да продолжам?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -86,22 +86,22 @@ msgstr ""
 "\n"
 "Можеби сакате само да го зачувате. Кој е вашиот избор?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Инсталирај"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Зачувај"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Изберете локација за зачувување на датотека"
@@ -206,12 +206,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "нема пакет именуван како %s"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Ве молиме почекајте..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Мора да сте root"
@@ -242,42 +242,42 @@ msgstr ""
 "%s\n"
 "Да продолжам?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Предупредување"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Во ред"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (за надоградување)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (за инсталирање)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Избор на пакети"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Потребен е еден од следниве пакети:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Откажи"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -288,14 +288,14 @@ msgstr ""
 "%s\n"
 "Да продолжам?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "За да се задоволат зависностите, следниов пакет ќе биде инсталиран (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -303,44 +303,51 @@ msgstr ""
 "За да се задоволат зависностите, ќе се инсталираат следниве %d пакети:\n"
 "%s\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d пакети"
 msgstr[1] "%d пакети"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "не можам да ги добија изворните пакети, прекинувам"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Се подготвувам..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталирам пакет `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Ве молиме внесете го медиумот именуван како \"%s\" во уредот [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Го преземам пакетот `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...преземањето не успеа: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Завршено"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -351,28 +358,27 @@ msgstr ""
 "%s\n"
 "Можеби сакате да ја ажурирате вашата urpmi база на податоци"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Инсталацијата не успеа"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Се е веќе инсталирано"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Инсталирањето заврши"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "отстранувам %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "рестартирам urpmi"
@@ -446,58 +452,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "употребувам одредена околина на %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "не можам да отворам rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "невалидно име на rpm датотеката [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "преземам rpm датотека [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...преземањето заврши"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...преземањето не успеа: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "не можам да пристапам до rpm датотеката [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "не можам да пренесам \"%s\" во датотека [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "не можам да ја регистрирам rpm датотеката"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "грешка при регистрирање на локалните пакети"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Оваа акција не е дозволена додека работи во затворен режим"
@@ -537,22 +537,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -644,82 +644,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Копирањето не успеа"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "поради недостаток на %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "поради недостаток на %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "поради недостаток на %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "отстранувам %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...преземањето не успеа: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "непознат протокол дефиниран за %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "не е пронајдено преземање од веб, поддржани преземања од веб се: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "не можам да ракувам со протоколот: %s"
@@ -739,12 +744,12 @@ msgstr "пакетот %s не е пронајден."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "преземам rpm датотеки од медиумот \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -752,47 +757,47 @@ msgstr ""
 "создадена трансакција за инсталирање на %s (отстрани=%d, инсталирај=%d, "
 "ажурирај=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "не можам да создадам трансакција"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "не можам да екстрактирам rpm од delta-rpm пакетот %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "не можам да го инсталирам пакетот %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "инсталирање на %s од %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...преземањето не успеа: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "го отстранувам пакетот %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "го отстранувам пакетот %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "инсталирање на %s од %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Повеќе информации за пакетот %s"
@@ -837,75 +842,80 @@ msgstr "Предупредување"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Инсталацијата не успеа"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Инсталацијата не успеа"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Следниве пакети имаат лоши потписи"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Следниве пакети имаат лоши потписи"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Дали сакате да продолжите со инсталацијата ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "инсталирање на %s од %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "дистрибуирам %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "инсталирање на %s од %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "инсталирам %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Обидете се со инсталација без проверка на зависности? (y/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Обидете се инсталација дури уште посилно (--force)? (y/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Возможна е инсталација"
@@ -1115,7 +1125,7 @@ msgstr "копирањето на [%s] не успеа (датотеката е
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "пресметувам md5sum на преземаниот изворен hdlist (или synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "копирањето на [%s] не успеа (md5sum не се совпаѓа)"
@@ -1155,32 +1165,32 @@ msgstr "не е пронајдена hdlist датотека за медиумо
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "преземам изворен hdlist (или synthesis) на \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "испитувам датотека со јавен клуч од \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...внесен клуч %s од датотека со јавен клуч од \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "не можам да внесам датотека со јавен клуч од \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "додаден медиум %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1195,94 +1205,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "читам rpm датотеки од [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Dd"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Извинете, лош избор, обидете се повторно\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "Избор на пакети"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Барај"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "го отстранувам медиумот \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1365,314 +1380,6 @@ msgstr "монтирам %s"
 msgid "unmounting %s"
 msgstr "одмонтирам %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf верзија %s\n"
-"Авторски права (C) 2002-2004 Mandriva.\n"
-"Ова е бесплатен софтвер и може да се редистрибуира под условите на GNU GPL.\n"
-"\n"
-"употреба:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - ја испишува оваа помошна порака.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - користи одредена околина (типично извештај за бубачка).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - не го користи дадениот медиум, одделено со запирка.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - користи друг root за инсталирање на rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - сортира медиуми според подстринговите одделени со "
-"запирка.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - ја користи дадената синтеза наместо базата на податоци на "
-"urpmi.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - ја користи дадената синтеза наместо базата на податоци на "
-"urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - не испишува идентични линии.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - користи само ажуриран медиум.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - опширен режим.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - игнорира разлика на буквите во секоја шема.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - игнорира разлика на буквите во секоја шема.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - вклучива код на perl директно како perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - бинарен И оператор.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - бинарен ИЛИ оператор.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - унарен НЕ.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - десна мала заграда за затворање на групен израз.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Листа на податоци за повраќање:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - користи X интерфејс.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    стандардните се %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - го испишува тагот на url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-"  --buildhost    - го испишува тагот на машината каде е направен rpm: "
-"машината каде е направен rpm.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "примени ги промените во конфигурационата датотека"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - го испишува тагот на конфликти: сите конфликти.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - го испишува тагот на описот: опис.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - го испишува тагот на epoch: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - ги испишува само имињата на пакетите.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - листа на датотеките во пакетот.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - го испишува тагот на групата: група.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - ги испишува само имињата на пакетите.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - ги испишува само имињата на пакетите.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-"  --obsoletes    - го испишува тагот на пакетите кои ќе бидат отстранети или "
-"заменети: сите отстранети или заменети.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr ""
-"  --packager     - го испишува тагот на личноста која го направила пакетот: "
-"личност која го направила пакетот.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-"  --provides     - го испишува тагот што всушност инсталира пакетот: сите за "
-"инсталирање.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-"  --requires     - го испишува тагот што всушност му е потребно на пакетот "
-"што ќе се инсталира: сите што се потребни.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - го испишува тагот на големината: големина.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - го испишува тагот на изворниот rpm: изворен rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-"  --obsoletes    - го испишува тагот на пакетите кои ќе бидат отстранети или "
-"заменети: сите отстранети или заменети.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - испишува резиме.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - го испишува тагот на url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - опширен режим.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - листа на датотеките во пакетот.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - испишува верзија, објавување и архитектура со име.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "изградена е hdlist synthesis датотека за медиумот \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "запишувам датотека со листа за медиумот \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1689,7 +1396,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Нема пакет именуван како %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Следниве пакети содржат %s: %s"
@@ -1699,47 +1406,47 @@ msgstr "Следниве пакети содржат %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Се е веќе инсталирано"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Се е веќе инсталирано"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Се е веќе инсталирано"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "поради недостаток на %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Се е веќе инсталирано"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "поради незадоволени %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "се обидувам да промовирам %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "за да се задржи %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1748,7 +1455,7 @@ msgstr ""
 "Следниве пакети треба да се отстранат за да други се надоградат:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1757,12 +1464,12 @@ msgstr ""
 "Следниве пакети треба да се отстранат за да други се надоградат:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "за да се инсталира %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "поради конфликти со %s"
@@ -1855,6 +1562,12 @@ msgstr ""
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - користи друг root за отстранување на rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - користи друг root за инсталирање на rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1886,39 +1599,39 @@ msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - избери ги сите пакети кои се совпаѓаат со изразот.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Само на суперкорисникот му е дозволено да отстранува пакети"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "непознати пакети"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "непознат пакет"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "отстранувањето на пакетот %s ќе го растури вашиот систем"
 msgstr[1] "отстранувањето на пакетот %s ќе го растури вашиот систем"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Нема за отстранување"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Нема за отстранување"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1930,45 +1643,341 @@ msgstr[1] ""
 "За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
 "MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "непознат пакет"
 msgstr[1] "непознат пакет"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "го отстранувам пакетот %s"
 msgstr[1] "го отстранувам пакетот %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "отстранливите уреди се земаат како \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Отстранувањето не успеа"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Отстранувањето не успеа"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf верзија %s\n"
+"Авторски права (C) 2002-2004 Mandriva.\n"
+"Ова е бесплатен софтвер и може да се редистрибуира под условите на GNU GPL.\n"
+"\n"
+"употреба:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - ја испишува оваа помошна порака.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - користи одредена околина (типично извештај за бубачка).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - не го користи дадениот медиум, одделено со запирка.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - сортира медиуми според подстринговите одделени со "
+"запирка.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - ја користи дадената синтеза наместо базата на податоци на "
+"urpmi.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - ја користи дадената синтеза наместо базата на податоци на "
+"urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - не испишува идентични линии.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - користи само ажуриран медиум.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - опширен режим.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - игнорира разлика на буквите во секоја шема.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - игнорира разлика на буквите во секоја шема.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - вклучива код на perl директно како perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - бинарен И оператор.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - бинарен ИЛИ оператор.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - унарен НЕ.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - десна мала заграда за затворање на групен израз.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Листа на податоци за повраќање:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - користи X интерфејс.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    стандардните се %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - го испишува тагот на url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+"  --buildhost    - го испишува тагот на машината каде е направен rpm: "
+"машината каде е направен rpm.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "примени ги промените во конфигурационата датотека"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - го испишува тагот на конфликти: сите конфликти.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - го испишува тагот на описот: опис.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - го испишува тагот на epoch: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - ги испишува само имињата на пакетите.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - листа на датотеките во пакетот.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - го испишува тагот на групата: група.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - ги испишува само имињата на пакетите.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - ги испишува само имињата на пакетите.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+"  --obsoletes    - го испишува тагот на пакетите кои ќе бидат отстранети или "
+"заменети: сите отстранети или заменети.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr ""
+"  --packager     - го испишува тагот на личноста која го направила пакетот: "
+"личност која го направила пакетот.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+"  --provides     - го испишува тагот што всушност инсталира пакетот: сите за "
+"инсталирање.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+"  --requires     - го испишува тагот што всушност му е потребно на пакетот "
+"што ќе се инсталира: сите што се потребни.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - го испишува тагот на големината: големина.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - го испишува тагот на изворниот rpm: изворен rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+"  --obsoletes    - го испишува тагот на пакетите кои ќе бидат отстранети или "
+"заменети: сите отстранети или заменети.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - испишува резиме.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - го испишува тагот на url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - опширен режим.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - листа на датотеките во пакетот.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - испишува верзија, објавување и архитектура со име.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "изградена е hdlist synthesis датотека за медиумот \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "запишувам датотека со листа за медиумот \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2330,36 +2339,31 @@ msgstr ""
 "Грешка: %s изгледа дека е монтиран само за читање.\n"
 "Користете --allow-force за да принудете операцијата."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (за надоградување)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (за надоградување)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (за инсталирање)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (за инсталирање)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2368,12 +2372,12 @@ msgstr ""
 "За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
 "MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Кој е вашиот избор? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2384,7 +2388,7 @@ msgstr ""
 "кои се постари од инсталираните:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2395,19 +2399,19 @@ msgstr ""
 "кои се постари од инсталираните:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Продолжуваме?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2416,7 +2420,7 @@ msgstr ""
 "Некои од бараните пакети не можат да се инсталираат:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2425,12 +2429,12 @@ msgstr ""
 "Некои од бараните пакети не можат да се инсталираат:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "отстранувањето на пакетот %s ќе го растури вашиот систем"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2441,7 +2445,7 @@ msgstr ""
 "треба да се отстранат за да други се надоградат:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2452,12 +2456,12 @@ msgstr ""
 "треба да се отстранат за да други се надоградат:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2467,7 +2471,7 @@ msgstr ""
 "Треба да се root за да ги инсталирате следниве зависности:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2478,39 +2482,39 @@ msgstr[1] ""
 "За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
 "MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Притиснете Ентер кога сте подготвени..."
@@ -2955,12 +2959,12 @@ msgstr "  -f             - принуди генерирање на hdlist да�
 msgid "Only superuser is allowed to update media"
 msgstr "Само на суперкорисникот му е дозволено да ажурира медиуми"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нема за ажурирање (користете urpmi.addmedia за додавање на медиум)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2969,17 +2973,17 @@ msgstr ""
 "недостасува внесот за ажурирање\n"
 "(еден од %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "игнорирање на медиумот %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "овозможување на медиумот %s"
diff --git a/po/mn.po b/po/mn.po
index 5b17a822..a825138e 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2003-08-22 19:38+0200\n"
 "Last-Translator: Khurelbaatar Lkhagvasuren <hujii247@yahoo.com>\n"
 "Language-Team: Mongolian <openmn-core@lists.sourceforge.net>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Суулгалтын бэлтгэл"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ок"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -46,7 +46,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -56,7 +56,7 @@ msgid ""
 "Proceed?"
 msgstr "Та г с"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -66,22 +66,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Суулгах"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Хадгалах"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Хүчингүй"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
@@ -180,12 +180,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Тухайлсан тушаал алга"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, fuzzy, c-format
 msgid "Please wait..."
 msgstr "Хүлээнэ үү."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr ""
@@ -213,42 +213,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "г с вы?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Анхааруулга"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "ямх"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Дараах багцуудын нэг нь шаардлагатай:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Таслах"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -256,56 +256,63 @@ msgid ""
 "Continue installation anyway?"
 msgstr "г с вы?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Дараах багцууд суулгагдах гэж байна"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Дараах багцууд суулгагдах гэж байна"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "Тааруухан багц"
 msgstr[1] "Тааруухан багц"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, fuzzy, c-format
 msgid "unable to get source packages, aborting"
 msgstr "%s багцийг устгаж болсонгүй"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Бэлдэж байна..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "с с"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' багцыг татан авч байна..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Биелэгдэв"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -316,28 +323,27 @@ msgstr ""
 "%s\n"
 "Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Суулгалтын асуудал"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, fuzzy, c-format
 msgid "Installation finished"
 msgstr "Суулгалт боломжтой"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "%s-г устгаж байна"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -409,58 +415,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "с"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb-г нээж болсонгүй"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "буруу rpm файлын нэр [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "rpm файлыг хүлээн авч байна [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...хүлээн авалт дууслаа"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "[%s] rpm файл руу хандаж болсонгүй"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "[%s] rpm файл руу хандаж болсонгүй"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm файлыг бүртгэж болсонгүй"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, fuzzy, c-format
 msgid "error registering local packages"
 msgstr "локал"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -500,22 +500,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -607,82 +607,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Хуулалт бүтэлгүйтэв"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "%s-г устгаж байна"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s-ийн хувьд үл мэдэгдэх протокол тодорхойлогдсон"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "%s багцийг суулгаж болсонгүй"
@@ -702,58 +707,58 @@ msgstr "с бол."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rpm файлыг хүлээн авч байна [%s] ..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, fuzzy, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "с"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "ssh таних тэмдэг үүсгэх боломжгүй"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "%s багцийг устгаж болсонгүй"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s багцийг суулгаж болсонгүй"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "%s багцийг устгалт"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "%s багцийг устгалт"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "%s багцийг устгалт"
@@ -798,75 +803,80 @@ msgstr "Анхааруулга"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, fuzzy, c-format
 msgid "Installation failed"
 msgstr "Суулгалтын асуудал"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Суулгалтын асуудал"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Дараах багцууд суулгагдах гэж байна"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Дараах багцууд суулгагдах гэж байна"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Та суулгалтыг үргэлжлүүлэхийг хүсэж байна уу?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Хамаарлыг шалгахгүйгээр суулгахыг оролдох уу? (y/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Reyna т N "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Суулгалт боломжтой"
@@ -1068,7 +1078,7 @@ msgstr "аас с"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "аас"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "аас с"
@@ -1108,32 +1118,32 @@ msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "hdlists файлыг хүлээн авч байна..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" хэвлэгчийн устгаж байна..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "%s файлыг нээж болохгүй байна\n"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "%s файлыг нээж болохгүй байна\n"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "%s файлыг нээж болохгүй байна\n"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1148,94 +1158,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "NnүҮ"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyтТ"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Харамсалтай нь буруу сонголт байна, дахин ородоно уу!\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Тандах"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "%s багцийг устгалт"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1318,294 +1333,6 @@ msgstr "%s-ийг салгаж байна"
 msgid "unmounting %s"
 msgstr "%s-ийг салгаж байна"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"mdkupdate Version %s\n"
-"Copyright ® %s Mandriva.\n"
-"Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
-"тарааж болно.\n"
-"\n"
-"Ашиглалт: \n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "Мөр"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "аас"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, fuzzy, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "аас"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr ""
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "Нарийвчилан харах бол Esc товч дарна уу"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "бол"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "баруун бүлэг"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Сэргээх өгөгдөлүүдийн жагсаалт:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Консол тохируулгын модул"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "Нарийвчилан харах бол Esc товч дарна уу"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "нэр"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "с"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "жигсаалт с"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1622,7 +1349,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "%s нэртэй багц байхгүй байна"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
@@ -1632,66 +1359,66 @@ msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "Юу ч үгүй"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "ямх"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Дараах багцууд суулгагдах гэж байна"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Дараах багцууд суулгагдах гэж байна"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "%s багцийг суулгаж болсонгүй"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
@@ -1783,6 +1510,12 @@ msgstr "  --list         - боломжтой багцуудын жагсаал�
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "Мөр"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "Мөр"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1810,39 +1543,39 @@ msgstr "Нарийвчилан харах бол Esc товч дарна уу"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "бол"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "үл мэдэгдэх багцууд"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "үл мэдэгдэх багц"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
 msgstr[1] "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
 
-#: ../urpme:126
+#: ../urpme:128
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Юу ч үгүй"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Юу ч үгүй"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1850,45 +1583,321 @@ msgid_plural ""
 msgstr[0] "тийш МБ"
 msgstr[1] "тийш МБ"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "үл мэдэгдэх багц"
 msgstr[1] "үл мэдэгдэх багц"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%s багцийг устгалт"
 msgstr[1] "%s багцийг устгалт"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "с"
 
-#: ../urpme:181
+#: ../urpme:185
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Хуулалт бүтэлгүйтэв"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Хуулалт бүтэлгүйтэв"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"mdkupdate Version %s\n"
+"Copyright ® %s Mandriva.\n"
+"Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
+"тарааж болно.\n"
+"\n"
+"Ашиглалт: \n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "аас"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, fuzzy, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "аас"
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "Нарийвчилан харах бол Esc товч дарна уу"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "бол"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "баруун бүлэг"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Сэргээх өгөгдөлүүдийн жагсаалт:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Консол тохируулгын модул"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "Нарийвчилан харах бол Esc товч дарна уу"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "нэр"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "с"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "жигсаалт с"
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2208,48 +2217,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "ямх"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "ямх"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "тийш МБ"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Таны сонголт юу бэ? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2257,7 +2261,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2265,38 +2269,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Ямар ч байсан үргэлжлүүлэх үү?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2304,7 +2308,7 @@ msgid ""
 "%s\n"
 msgstr "г с вы?"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2312,12 +2316,12 @@ msgid ""
 "%s\n"
 msgstr "г с вы?"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2325,46 +2329,46 @@ msgid ""
 "%s\n"
 msgstr "Та г с"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "тийш МБ"
 msgstr[1] "тийш МБ"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Хүчингүй"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
@@ -2782,29 +2786,29 @@ msgstr "  -c             - түр санах ойн хавтасын толго�
 msgid "Only superuser is allowed to update media"
 msgstr "бол"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, fuzzy, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "юу ч үгүй"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, fuzzy, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr "бол г аас с"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "с"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "с"
diff --git a/po/ms.po b/po/ms.po
index 106501d0..d20b27be 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-08-21 23:48+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Pemasangan RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -43,7 +43,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "Teruskan?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -68,22 +68,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Pasang"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Pilih lokasi untuk menyimpan fail"
@@ -179,12 +179,12 @@ msgstr "  --update       - guna hanya kemaskini media.\n"
 msgid "No packages specified"
 msgstr "Tiada pakej dinyatakan"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Sila tunggu..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Mesti menjadi root"
@@ -212,42 +212,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "semua telah diinstal"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Amaran"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (untuk naiktaraf)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (untuk memasang)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Pilihan pakej"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Batal"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -258,13 +258,13 @@ msgstr ""
 "%s\n"
 "Teruskan?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -272,44 +272,51 @@ msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "_Saiz (MB):"
 msgstr[1] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Menyediakan..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Sila tunggu, mengeluarkan medium..."
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Memuatturun pakej `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...gagal terambil: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Selesai"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -317,28 +324,27 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalasi gagal"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "semua telah diinstal"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Pemasangan selesai"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "membuang %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "Tambah media urpmi"
@@ -411,58 +417,52 @@ msgstr "Direktori didalam nama path yang diberi tidak wujud."
 msgid "using specific environment on %s\n"
 msgstr "Mencipta swap dienkrip pada %s using %s:"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "tidak dapat membuka rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nama fail rpm [%s] tidak sah"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "mengambil fail rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...capaian selesai"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...gagal terambil: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "tidak dapat menghurai \"%s\" dalam fail [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "tidak dapat mendaftarkan fail rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, fuzzy, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "  --root         - guna root lain untuk membuang rpm.\n"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "ralat pendaftaran pakej setempat"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -502,22 +502,22 @@ msgstr "Ungkapan corak:\n"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, fuzzy, c-format
 msgid "Can't use %s without %s"
 msgstr "Tutup Tanpa Simpan"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, fuzzy, c-format
 msgid "Can't use %s with %s"
 msgstr "hidupkan penggunaan TLS dengan LDAP"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, fuzzy, c-format
 msgid "Too many arguments\n"
 msgstr "%s: terlalu banyak hujah\n"
@@ -609,82 +609,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr "Aksara (dengan ruang):"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Sambungan Gagal"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "kerana kehilangan %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "kerana kehilangan %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, fuzzy, c-format
 msgid "rsync is missing\n"
 msgstr "kerana kehilangan %s"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, fuzzy, c-format
 msgid "ssh is missing\n"
 msgstr "kerana kehilangan %s"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, fuzzy, c-format
 msgid "prozilla is missing\n"
 msgstr "kerana kehilangan %s"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, fuzzy, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Laksana skrip bantuan"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "kerana kehilangan %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, fuzzy, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "Muatturun `%s', kelajuan:%s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "Menerima"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "%s tidak diambil... "
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "tiada protokol ditakrif untuk `%s'"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "tiada webfetch dijumpai, webfetch yang disokong adalah: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "tidak dapat mengawal protokol: %s"
@@ -704,58 +709,58 @@ msgstr "pakej %s tidak dijumpai."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "mendapatkan fail rpm dari media \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "tidak dapat mencipta transaksi"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "tidak dapat mengekstrak rpm daripada pakej delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "tidak dapat memasang pakej %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "mendapatkan fail rpm dari media \"%s\"..."
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "Sambungan Gagal"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "membuang pakej %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "membuang pakej %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "Sahkan RPM untuk dipasang:"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Lebih maklumat pada pakej %s"
@@ -800,25 +805,30 @@ msgstr "@r adalah bukan @d; menghentikan.\n"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Instalasi gagal"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr ""
@@ -826,52 +836,52 @@ msgstr ""
 " pakej berikut berjaya:\n"
 "\n"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Adakah anda pasti untuk meneruskan"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "Sahkan RPM untuk dipasang:"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "Mulakan %s:"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "Dari Fail"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "Memasang %s\n"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Pemasangan sekecil mungkin"
@@ -1073,7 +1083,7 @@ msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
@@ -1113,32 +1123,32 @@ msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "periksa file sintesis [%s]"
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "memeriksa fail pubkey \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "tidak dapat mengimport fail pubkey \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "tidak dapat mengimport fail pubkey \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "Tambah medium"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed"
 msgstr "Sambungan Gagal"
@@ -1153,94 +1163,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "Pilih dokumen dari senarai:"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "NnTt"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/T) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Salah pilih, cuba lagi\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "Pakej:"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versi"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Release"
 msgstr "Nota Keluaran Fedora"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Cari"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, fuzzy, c-format
 msgid "(suggested)"
 msgstr "    Penyelesaian dicadangkan:\n"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "Sederhana"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "command line"
 msgstr "Arahan Baris"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1323,291 +1338,6 @@ msgstr "mounting %s"
 msgid "unmounting %s"
 msgstr "unmount %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"versi mdkupdate %s\n"
-"Hakmilik (C) %s Mandriva.\n"
-"Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
-"\n"
-"penggunaan:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version       - cetak nombor versi alatan ini.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - guna root lain untuk membuang rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - jangan cetak baris yang sama.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - mod verbos.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Ungkapan corak:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - bersihkan direktori kache header.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operator binari AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operator binari OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unari NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - kurungan kiri dan kanan.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - nyatakan format keluaran seperti printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   contoh: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "Rekabentuk Sasaran:"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "%s %s pemasangan pada hos %s"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, fuzzy, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "Tarikh/masa bolehubah"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "kemaskini semua fail tetapan"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "dijangkakan %d pengurangan/pengurangan konflik"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "Pelihat Pakej"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, fuzzy, c-format
-msgid "  --distribution - distribution\n"
-msgstr "Sumber edaran"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "Saat semenjak permulaan zaman"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "Pelihat Pakej"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "Cache Fail Pakej Jauh"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "Kumpulan"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "Nama Pakej"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "Pelihat Pakej"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "Tidak dapat menulis tag!"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "% dari saiz normal"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "nama fail rpm [%s] tidak sah"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "Ringkasan"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "URL:"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "Pengeluar"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "Cache Fail Pakej Jauh"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "Tiada status tersedia utk pakej ini\n"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "Tiada status tersedia utk pakej ini\n"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "menulis senarai fail untuk media \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1624,7 +1354,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Tiada pakej bernama %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Pakej berikut mengandungi %s: %s"
@@ -1634,47 +1364,47 @@ msgstr "Pakej berikut mengandungi %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "semua telah diinstal"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "semua telah diinstal"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "semua telah diinstal"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "kerana kehilangan %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "semua telah diinstal"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "kerana ketidakpuasan %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "cuba untuk menaikkan %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "untuk menyimpan %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1684,7 +1414,7 @@ msgstr ""
 "%s\n"
 "Teruskan?"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1694,12 +1424,12 @@ msgstr ""
 "%s\n"
 "Teruskan?"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "untuk memasang %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "kerana konflik dengan %s"
@@ -1790,6 +1520,12 @@ msgstr "Tidak dapat menulis tag!"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - guna root lain untuk membuang rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - guna root lain untuk membuang rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1817,39 +1553,39 @@ msgstr "  --verbose      - mod verbos.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Hanya superuser dibenarkan untuk membuang pakej"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pakej tidak diketahui"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pakej tidak diketahui"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Salah satu pakej berikut diperlukan:"
 msgstr[1] "Salah satu pakej berikut diperlukan:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Tiada untuk dibuang"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "gagal untuk membuang direktori %s: %s\n"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1861,45 +1597,318 @@ msgstr[1] ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "Pelihat Pakej"
 msgstr[1] "pakej tidak diketahui"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Buang kekunci"
 msgstr[1] "membuang pakej %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/T) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Membuang Sumber"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Pembuangan gagal"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Pemasangan sekecil mungkin"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"versi mdkupdate %s\n"
+"Hakmilik (C) %s Mandriva.\n"
+"Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
+"\n"
+"penggunaan:\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version       - cetak nombor versi alatan ini.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --update       - guna hanya kemaskini media.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - jangan cetak baris yang sama.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - guna hanya kemaskini media.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - mod verbos.\n"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Ungkapan corak:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - bersihkan direktori kache header.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operator binari AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operator binari OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unari NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - kurungan kiri dan kanan.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - nyatakan format keluaran seperti printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   contoh: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "Rekabentuk Sasaran:"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "%s %s pemasangan pada hos %s"
+
+#: ../urpmf:63
+#, fuzzy, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "Tarikh/masa bolehubah"
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "kemaskini semua fail tetapan"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "dijangkakan %d pengurangan/pengurangan konflik"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "Pelihat Pakej"
+
+#: ../urpmf:67
+#, fuzzy, c-format
+msgid "  --distribution - distribution\n"
+msgstr "Sumber edaran"
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "Saat semenjak permulaan zaman"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "Pelihat Pakej"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "Cache Fail Pakej Jauh"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "Kumpulan"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "Nama Pakej"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "Pelihat Pakej"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "Tidak dapat menulis tag!"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "% dari saiz normal"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "nama fail rpm [%s] tidak sah"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "Ringkasan"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "URL:"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "Pengeluar"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "Cache Fail Pakej Jauh"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
+
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Penyunting Ungkapan Nalar (regexp)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "Tiada status tersedia utk pakej ini\n"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "Tiada status tersedia utk pakej ini\n"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "menulis senarai fail untuk media \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2213,36 +2222,31 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, fuzzy, c-format
-msgid "Updating media...\n"
-msgstr "Sila tunggu, mengemaskini media..."
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (untuk naiktaraf)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (untuk naiktaraf)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (untuk memasang)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (untuk memasang)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2251,12 +2255,12 @@ msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2264,7 +2268,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2272,38 +2276,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Teruskan juga?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/t) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr "semua telah diinstal"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr "semua telah diinstal"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2314,7 +2318,7 @@ msgstr ""
 "%s\n"
 "Teruskan?"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2325,12 +2329,12 @@ msgstr ""
 "%s\n"
 "Teruskan?"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2340,7 +2344,7 @@ msgstr ""
 "Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2349,39 +2353,39 @@ msgstr[1] ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s mestilah nombor"
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tekan <enter> untuk shell"
@@ -2809,13 +2813,13 @@ msgstr "  -f             - paksa buat fail hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2824,17 +2828,17 @@ msgstr ""
 "masukan kemaskini hilang\n"
 "(satu dari %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Media Storan"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "Media Storan"
@@ -3105,6 +3109,10 @@ msgid "No changelog found\n"
 msgstr "Tiada log perubahan dijumpai\n"
 
 #, fuzzy
+#~ msgid "Updating media...\n"
+#~ msgstr "Sila tunggu, mengemaskini media..."
+
+#, fuzzy
 #~ msgid "examining %s file"
 #~ msgstr "periksa file sintesis [%s]"
 
diff --git a/po/mt.po b/po/mt.po
index dea70aca..3cca67c2 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2004-09-07 05:59+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -21,22 +21,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Installazzjoni tas-sistema"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, fuzzy, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "X'tixtieq tagħmel?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -72,7 +72,7 @@ msgstr ""
 "\n"
 "Inkella tista' sempliċiment tikteb il-fajls. X'tippreferi?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -87,22 +87,22 @@ msgstr ""
 "\n"
 "Inkella tista' sempliċiment tikteb il-fajls. X'tippreferi?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, fuzzy, c-format
 msgid "_Install"
 msgstr "Installa"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, fuzzy, c-format
 msgid "_Save"
 msgstr "Ikteb"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "I_kkanċella"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Agħżel fejn tikteb il-fajl"
@@ -204,12 +204,12 @@ msgstr "  --media        - uża biss is-sorsi llistjati b'virgoli.\n"
 msgid "No packages specified"
 msgstr "Ebda kmand speċifikat"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, fuzzy, c-format
 msgid "Please wait..."
 msgstr "Stenna ftit."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Port tal-maws"
@@ -239,42 +239,42 @@ msgstr ""
 "Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
 "%s"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Twissija"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Aġġornament"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Oħroġ mill-installazzjoni"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Waqqaf"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -284,7 +284,7 @@ msgstr ""
 "Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
 "%s"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -292,51 +292,58 @@ msgstr ""
 "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
 "d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Biex nissodisfa d-dipendenzi, %d pakkett/i jridu jiġu nstallati wkoll (%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Qed nipprepara..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Qed jitniżżel il-pakkett \"%s\"..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...qari falla: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Lest"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -348,28 +355,27 @@ msgstr ""
 "%s\n"
 "Forsi trid taġġorna d-database urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "installazzjoni falliet"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "kollox diġà installat"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Installazzjoni lesta"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "qed jitneħħa %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "qed jiġi ristartjat urpmi"
@@ -443,58 +449,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "qed jintuża ambjent speċifiku fuq %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ma nistax niftaħ rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "isem tal-fajl rpm [%s] invalidu"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "qed jinġab il-fajl rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...qari lest"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...qari falla: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ma nistax naċċessa l-fajl rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ma nistax nifli \"%s\" fil-fajl [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ma nistax nirreġistra l-fajl rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -534,22 +534,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -641,82 +641,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Ikkupjar falla"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "minħabba %s nieqes"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "minħabba %s nieqes"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "minħabba %s nieqes"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "qed jitneħħa %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...qari falla: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protokoll mhux magħruf definit għal %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "ma nstabx webfetch; webfetch aċċettati huma: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ma nistax nuża l-protokoll: %s"
@@ -736,58 +741,58 @@ msgstr "pakkett %s ma nstabx."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "qed jinġabu l-fajls rpm mis-sors \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "qed tinħoloq tranżazzjoni għal %s (neħħi=%d, installa=%d, aġġorna=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "ma nistax noħloq tranżazzjoni"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ma nistax inneħħi l-pakkett %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "ma nistax ninstalla l-pakkett %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "qed jiġi nstallat %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...qari falla: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "ed jitneħħa l-pakkett %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "ed jitneħħa l-pakkett %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "qed jiġi nstallat %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Iżjed informazzjoni dwar pakkett %s"
@@ -832,75 +837,80 @@ msgstr "Twissija"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "installazzjoni falliet"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "installazzjoni falliet"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Dawn il-pakketti fihom firem ħżiena"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Dawn il-pakketti fihom firem ħżiena"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Trid tkompli l-installazzjoni ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "qed jiġi nstallat %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "qed jiġi distribwit %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "qed jiġi nstallat %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "qed jiġi nstallat %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Installazzjoni possibbli"
@@ -1106,7 +1116,7 @@ msgstr "l-ikkuppjar tal-fajl [%s] falla (il-fajl jidher żgħir wisq)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "qed tiġi kalkulata l-md5sum għall-hdlist jew sinteżi tas-sors imniżżel"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "l-ikkuppjar tal-fajl [%s] falla (md5sum ma qablitx)"
@@ -1146,32 +1156,32 @@ msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "qed jiġi eżaminat fajl pubkey ta' \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...ċifrarju %s importat mill-fajl pubkey ta' \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ma stajtx nimporta fajl pubkey ta' \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "ġie miżjud is-sors %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1186,94 +1196,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "qed jinqraw fajls rpm minn [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "LlNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "IiYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (i/L) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Għażla ħażina, jiddispjaċini. Erġa' pprova\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Fittex"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "qed jitneħħa s-sors \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1356,299 +1371,6 @@ msgstr "qed jiġi mmuntat %s"
 msgid "unmounting %s"
 msgstr "qed niżmonta %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf verżjoni %s\n"
-"Copyright (C) 2002-2004 Mandriva.\n"
-"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
-"GPL.\n"
-"\n"
-"użu:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - uri dan il-messaġġ ta' għajnuna.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - eskludi s-sorsi msemmija, separati b'virgoli.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - uża root ieħor għall-installazzjoni rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - issortja s-sorsi skond strings separati b'virgola.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - turix linji identiċi.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - qis ittri kbar u żgħar l-istess f'kull mudell.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - qis ittri kbar u żgħar l-istess f'kull mudell.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - includi kodiċi perl direttament bħala perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operatur AND binarju.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operatur OR binarju.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - operatur NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  (              - parenteżi tal-lemin, biex tagħlaq grupp ta' "
-"espressjonijiet.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Lista ta' informazzjoni x'tirrestawra:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - uża l-interfaċċja X.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    l-istandard huwa %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - uri l-url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - uri t-tag \"buildhost\": kompjuter fejn inbena.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Konfigurazzjoni ta' Konsole"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - uri \"conflicts\": kull ma joħloq konflitt\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - uri t-tag \"description\": deskrizzjoni\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - uri t-tag epoch: epoka.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - illistja l-fajls fil-pakkett.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - uri l-grupp.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\"\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - uri t-tag \"packager\": pakkeġġjatur.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - uri \"provides\" - kull ma jipprovdi\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - uri d-daqs.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - print tag \"sourcerpm\": rpm tas-sors.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\"\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - uri t-tag \"summary\": sommarju.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - uri l-url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - illistja l-fajls fil-pakkett.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1665,7 +1387,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Ebda pakkett imsejjaħ %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Dawn il-pakketti fihom %s: %s"
@@ -1675,47 +1397,47 @@ msgstr "Dawn il-pakketti fihom %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "kollox diġà installat"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "kollox diġà installat"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "kollox diġà installat"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "minħabba %s nieqes"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "kollox diġà installat"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "minħabba %s mhux sodisfatt"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "qed nipprova nippromwovi %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "sabiex inżomm %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1724,7 +1446,7 @@ msgstr ""
 "Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1733,12 +1455,12 @@ msgstr ""
 "Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "sabiex ninstalla %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "minħabba konflitt ma' %s"
@@ -1830,6 +1552,12 @@ msgstr "  --packager     - uri t-tag \"packager\": pakkeġġjatur.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - uża root ieħor għall-installazzjoni rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - uża root ieħor għall-installazzjoni rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1859,39 +1587,39 @@ msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Is-\"superuser\" biss għandu l-awtorità ineħħi sorsi"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pakketti mhux magħrufa"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pakkett mhux magħruf"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
 msgstr[1] "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "M'hemm xejn x'inneħħi"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "M'hemm xejn x'inneħħi"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1901,45 +1629,326 @@ msgstr[0] ""
 msgstr[1] ""
 "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "pakkett mhux magħruf"
 msgstr[1] "pakkett mhux magħruf"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "ed jitneħħa l-pakkett %s"
 msgstr[1] "ed jitneħħa l-pakkett %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (i/L) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Tneħħija falliet"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Tneħħija falliet"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf verżjoni %s\n"
+"Copyright (C) 2002-2004 Mandriva.\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+"GPL.\n"
+"\n"
+"użu:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - uri dan il-messaġġ ta' għajnuna.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - eskludi s-sorsi msemmija, separati b'virgoli.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - issortja s-sorsi skond strings separati b'virgola.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - turix linji identiċi.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - qis ittri kbar u żgħar l-istess f'kull mudell.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - qis ittri kbar u żgħar l-istess f'kull mudell.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - includi kodiċi perl direttament bħala perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operatur AND binarju.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operatur OR binarju.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - operatur NOT.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  (              - parenteżi tal-lemin, biex tagħlaq grupp ta' "
+"espressjonijiet.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Lista ta' informazzjoni x'tirrestawra:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - uża l-interfaċċja X.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    l-istandard huwa %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - uri l-url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - uri t-tag \"buildhost\": kompjuter fejn inbena.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Konfigurazzjoni ta' Konsole"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - uri \"conflicts\": kull ma joħloq konflitt\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - uri t-tag \"description\": deskrizzjoni\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - uri t-tag epoch: epoka.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - illistja l-fajls fil-pakkett.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - uri l-grupp.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\"\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - uri t-tag \"packager\": pakkeġġjatur.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - uri \"provides\" - kull ma jipprovdi\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - uri d-daqs.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - print tag \"sourcerpm\": rpm tas-sors.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\"\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - uri t-tag \"summary\": sommarju.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - uri l-url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - illistja l-fajls fil-pakkett.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2292,36 +2301,31 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Aġġornament"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Aġġornament"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Oħroġ mill-installazzjoni"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Oħroġ mill-installazzjoni"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2329,12 +2333,12 @@ msgid ""
 msgstr ""
 "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "X'tagħżel? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2342,7 +2346,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2350,19 +2354,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Trid tkompli xorta?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (I/l) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2371,7 +2375,7 @@ msgstr ""
 "Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2380,12 +2384,12 @@ msgstr ""
 "Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2396,7 +2400,7 @@ msgstr ""
 "jitneħħew sabiex oħrajn jiġu aġġornati:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2407,12 +2411,12 @@ msgstr ""
 "jitneħħew sabiex oħrajn jiġu aġġornati:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2422,7 +2426,7 @@ msgstr ""
 "Trid tkun \"root\" biex tinstalla dawn id-dipendenzi:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2431,39 +2435,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Ikkanċella"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Agħfas Enter meta tlesti..."
@@ -2900,12 +2904,12 @@ msgstr "  -f             - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Is-\"superuser\" biss għandu l-awtorità jaġġorna sorsi"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "m'hemm xejn x'naġġorna (uża urpmi.addmedia biex iżżid sors)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2914,17 +2918,17 @@ msgstr ""
 "l-element li trid taġġorna m'hux hemm\n"
 "(wieħed minn %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Editja s-sors \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "qed jitneħħa s-sors \"%s\""
diff --git a/po/nb.po b/po/nb.po
index 2a7d8d35..692a848e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2007-09-17 14:07+0200\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@mandriva.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -26,22 +26,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-installasjon"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Feil: klarte ikke å finne fila «%s», vil avbryte operasjon."
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "Hva ønsker du å gjøre?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Fortsett?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -92,22 +92,22 @@ msgstr ""
 "\n"
 "Det kan være at du bare foretrekker å lagre den. Hva vil du gjøre?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Installer"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Velg sted hvor fil skal lagres."
@@ -211,12 +211,12 @@ msgstr "  --searchmedia  – Bare se etter pakker i dette mediet.\n"
 msgid "No packages specified"
 msgstr "Ingen pakker spesifisert"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Vent litt ..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Må være root"
@@ -247,42 +247,42 @@ msgstr ""
 "%s\n"
 "Fortsett installasjon uansett?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (å oppgradere)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (å installere)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Pakkevalg"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "En av følgende pakker trengs:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Avbryt"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -293,56 +293,63 @@ msgstr ""
 "%s\n"
 "Fortsett installasjon uansett?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "For å oppfylle avhengighet vil den følgende pakken bli installert:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "For å oppfylle avhengigheter vil disse pakkene bli installert:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakke – %d MB)"
 msgstr[1] "(%d pakker– %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kunne ikke få tak i kildepakker, avslutter"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Forbereder ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke «%s» (%s/%s) ..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Sett inn mediumet kalt «%s» på enhet [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laster ned pakke «%s» ..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... Mottak mislykket: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Ferdig"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -353,28 +360,27 @@ msgstr ""
 "%s\n"
 "Du ønsker antageligvis å oppdatere urpmi-databasen din"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Installasjon mislyktes:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Pakken(e) er allerede installert"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Installasjon ferdig"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "Fjerner «%s»."
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "starter urpmi på nytt"
@@ -448,58 +454,52 @@ msgstr "Omgivelsekatalog %s eksisterer ikke"
 msgid "using specific environment on %s\n"
 msgstr "Bruker egendefinert miljø på «%s»\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "kunne ikke åpne rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ugyldig rpm-filnavn [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "mottar rpm-fil [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "... ferdig mottatt."
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... Mottak mislykket: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Klarte ikke lese nå rpm-fil [%s]."
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Klarte ikke tolke spec-fil %s [%s]."
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "Klarte ikke registrere rpm-fil."
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Inkompatibel arkitektur for rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "Feil ved registrering av lokale pakker."
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Du kan ikke kjøre denne i begrenset modus."
@@ -539,22 +539,22 @@ msgstr "Søkestrenguttrykk:\n"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "«chroot»-mappa finnes ikke."
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan ikke bruke «%s» uten «%s»."
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan ikke bruke «%s» med «%s»."
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "For mange argumenter\n"
@@ -646,83 +646,88 @@ msgstr "%s-feil: Avslutt med signalet «%d»."
 msgid "%s failed: exited with %d"
 msgstr "%s-feil: Avslutt med «%d»."
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "mislykket kopiering."
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget mangler.\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl mangler.\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl-feil: Nedlasting avbrutt.\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync mangler.\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh mangler.\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla mangler.\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Klarte ikke kjøre prozilla.\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "prozilla mangler.\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s %% av %s fullført. Tid igjen: %s. Hastighet: %s."
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s %% fullført. Hastighet: %s."
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "henter «%s»."
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "hentet «%s»."
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ukjent protokoll definert for %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 "Inget nedlastningsprogram funnet, støttede nedlastningsprogram er: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "Kunne ikke håndtere protokoll: %s"
@@ -742,12 +747,12 @@ msgstr "Fant ikke pakken «%s»."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "mottar rpm-filer fra medium «%s» ..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[ompakking]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -755,47 +760,47 @@ msgstr ""
 "Opprettet transaksjon for installasjon på «%s» (fjern=%d, installer=%d, "
 "oppgrader=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "Klarte ikke ikke opprette transaksjon."
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "Klarte ikke pakke ut rpm fra delta-rpm-pakke «%s»."
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "Klarte ikke installere pakke «%s»"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "Fjerner installerte rpm-pakker (%s) fra «%s»."
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "... Mottak mislykket: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Fjerner pakken «%s»"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "Fjerner pakke «%s»"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "Fjerner installerte rpm-pakker (%s) fra «%s»."
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Mer informasjon om pakke %s"
@@ -840,75 +845,80 @@ msgstr "avbryter"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Installasjon mislykket"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Installasjon mislyktes:"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Denne pakken har ugyldig signatur"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Disse pakkene har ugyldige signaturer"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ønsker du å fortsette installasjonen?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "Fjerner installerte rpm-pakker (%s) fra «%s»."
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "Fordeler %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "Installerer %s fra %s."
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "Installerer %s."
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Prøv å installere uten å sjekke avhengigheter? (j/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Prøv enda hardere å installere («--force»)? (j/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pakkene er av nyeste versjon"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Installasjon er mulig"
@@ -1112,7 +1122,7 @@ msgstr "Mislykket kopiering av [%s] (fila er mistenkelig liten)."
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "Regner ut md5sum til mottatt kilde-«hdlist» (eller -syntese)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Mislykket kopiering av [%s] (md5sum stemmer ikke)."
@@ -1152,32 +1162,32 @@ msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "Mottar kilde-«hdlist» (eller -syntese) for «%s» ..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Undersøker offentlig nøkkel-til «%s» ..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... Importerer nøkkelen «%s» fra offentlig nøkkel-fil «%s»."
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Klarte ikke importere offentlig nøkkel-fil «%s»."
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "Oppdatert medium «%s»."
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1192,94 +1202,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "Leser rpm-filer fra [%s]."
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Feil valg. Prøv på nytt\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pakkevalg"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versjon"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Utgivelse"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arkitektur"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(forslag)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "Legg til medium «%s»."
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "kommandolinje"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1362,301 +1377,6 @@ msgstr "Monterer «%s»."
 msgid "unmounting %s"
 msgstr "Avmonterer «%s»"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf – versjon %s\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"Dette er fri programvare og kan videredistribueres under vilkårene til GNU "
-"GPL.\n"
-"\n"
-"Bruk: urpmf [valg] søkestrenguttrykk\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      – Vis versjonsnummerer til dette verktøyet.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          – Bruk egendefinert miljø (vanligvis ved en feilrapport).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia – Ikke bruk gitt medie (kommadelt liste).\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  – Ingen treff på søkestrenger, bruk bare argument som "
-"tekst.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   – Bruk annen rot for urpmi-database og rpm-installering.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    – Sorter medium etter delstrenger (kommadelt liste).\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  – Bruk denne stien for tilgang til media.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    – Bruk syntese i stedet for hele databasen.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         – Vis ikke identiske linjer.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       – Bruk bare oppdateringsmedie.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      – Utvida meldinger.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             – Ikke skill mellom store og små bokstaver.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             – Skill mellom store og små bokstaver i søkestrenger "
-"(standard).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        – Bytt feltseparator (standard er «:»).\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Søkestrenguttrykk:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           – All tekst er lest som regulære uttrykk, med mindre «-l» er "
-"brukt.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             – Ta med perl-kode direkte, som «perl -e».\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             – Binær OG-operatør.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             – Binær ELLER-operatør.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              – Unær IKKE-operator.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            – Venstre- og høyreparentes.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Oversikt over etiketter:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           – Bruk et printf-lignende utformat\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   Eksempel: «%%navn:%%filer»\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         – Arkitektur.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    – Byggevert.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    – Byggetidspunkt.\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    – Oppsettfiler.\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    – Konfliktetiketter.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  – Pakkebeskrivelse.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution – Distribusjon.\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        – Epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     – Filnavn til pakka.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        – liste over filer i pakka.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        – Gruppe.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      – Vis lisensvilkår.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         – Pakkenavn.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    – Utdatert-etiketter.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     – Pakkebygger.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     – Tilbudsetiketter.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     – Avhengighetsetiketter.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         – Installert størrelse.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    – navn på kilde-rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     – Forslagsetiketter.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      – Sammendrag.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          – Adresse.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       – Leverandør.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             – Mediet som pakken ble funnet i.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             – Vis versjon, utgivelse og arkitektur med navn.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Ugyldig format: du kan bare bruke én flerverdietikett."
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "bygd hdlistesyntese-fil for medium «%s»"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "Skriver listefil for medium «%s»."
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1677,7 +1397,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Det finnes ingen  «%s»-pakke."
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Følgende pakker inneholder %s: %s"
@@ -1687,47 +1407,47 @@ msgstr "Følgende pakker inneholder %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Pakkene «%s» kan ikke installeres."
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakken «%s» er allerede installert."
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pakkene «%s» er allerede installerte."
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "da «%s» mangler"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "da «%s» allerede er installert"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "da «%s» ikke er tilfredsstilt"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "Prøver å priroritere «%s»"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å kunne beholde «%s»"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1736,7 +1456,7 @@ msgstr ""
 "Denne pakken må fjernes for at andre skal kunna oppgraderes:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1745,12 +1465,12 @@ msgstr ""
 "Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "for å kunne installere «%s»"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "på grunn av konflikter med «%s»."
@@ -1842,6 +1562,13 @@ msgstr "  --repackage    – Pakk om filer før sletting\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         – bruk annen rot for rpm-fjerning.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   – Bruk annen rot for urpmi-database og rpm-installering.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1872,39 +1599,39 @@ msgstr "  --verbose, -v  – Utvidede meldingar.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             – Velg alle pakker som stemmer med uttrykket.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Bare superbruker har adgang til å fjerne pakker."
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "Ukjente pakker"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "ukjent pakke"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Du vil ødelegge systemet ditt hvis du fjerner pakken «%s»."
 msgstr[1] "Du vil ødelegge systemet ditt hvis du fjerner pakken «%s»."
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting å fjerne."
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Ingenting å fjerne."
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1912,45 +1639,327 @@ msgid_plural ""
 msgstr[0] "For å oppfylle avhengigheter vil den følgende pakken bli fjernet"
 msgstr[1] "For å oppfylle avhengigheter vil de følgende %d pakkene bli fjernet"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "ukjent pakke"
 msgstr[1] "ukjent pakke"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Vil du fjerne %d pakke?"
 msgstr[1] "Vil du fjerne %d pakker?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Bruker flyttbar enhet som «%s»."
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Klarte ikke fjerne."
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Klarte ikke fjerne."
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf – versjon %s\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"Dette er fri programvare og kan videredistribueres under vilkårene til GNU "
+"GPL.\n"
+"\n"
+"Bruk: urpmf [valg] søkestrenguttrykk\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      – Vis versjonsnummerer til dette verktøyet.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          – Bruk egendefinert miljø (vanligvis ved en feilrapport).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia – Ikke bruk gitt medie (kommadelt liste).\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  – Ingen treff på søkestrenger, bruk bare argument som "
+"tekst.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    – Sorter medium etter delstrenger (kommadelt liste).\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  – Bruk denne stien for tilgang til media.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    – Bruk syntese i stedet for hele databasen.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         – Vis ikke identiske linjer.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       – Bruk bare oppdateringsmedie.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      – Utvida meldinger.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             – Ikke skill mellom store og små bokstaver.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             – Skill mellom store og små bokstaver i søkestrenger "
+"(standard).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        – Bytt feltseparator (standard er «:»).\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Søkestrenguttrykk:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           – All tekst er lest som regulære uttrykk, med mindre «-l» er "
+"brukt.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             – Ta med perl-kode direkte, som «perl -e».\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             – Binær OG-operatør.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             – Binær ELLER-operatør.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              – Unær IKKE-operator.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            – Venstre- og høyreparentes.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Oversikt over etiketter:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           – Bruk et printf-lignende utformat\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   Eksempel: «%%navn:%%filer»\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         – Arkitektur.\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    – Byggevert.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    – Byggetidspunkt.\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    – Oppsettfiler.\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    – Konfliktetiketter.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  – Pakkebeskrivelse.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution – Distribusjon.\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        – Epoch.\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     – Filnavn til pakka.\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        – liste over filer i pakka.\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        – Gruppe.\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      – Vis lisensvilkår.\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         – Pakkenavn.\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    – Utdatert-etiketter.\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     – Pakkebygger.\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     – Tilbudsetiketter.\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     – Avhengighetsetiketter.\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         – Installert størrelse.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    – navn på kilde-rpm.\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     – Forslagsetiketter.\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      – Sammendrag.\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          – Adresse.\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       – Leverandør.\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             – Mediet som pakken ble funnet i.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             – Vis versjon, utgivelse og arkitektur med navn.\n"
+
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Søkestrenguttrykk:\n"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Ugyldig format: du kan bare bruke én flerverdietikett."
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "bygd hdlistesyntese-fil for medium «%s»"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "Skriver listefil for medium «%s»."
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2298,48 +2307,43 @@ msgstr ""
 "Feil: %s ser ut til å være montert skrivebeskyttet.\n"
 "Bruk --allow-force for å tvinge operasjonen."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Oppdaterer medie...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (oppgradering)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (oppgradering)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (installering)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (installering)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "På grunn av avhengigheter på «%s» trenger du én av disse pakkene:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hva er ditt valg? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2350,7 +2354,7 @@ msgstr ""
 "som er eldre enn de installerte pakkene:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2361,7 +2365,7 @@ msgstr ""
 "som er eldre enn de som er installert:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2370,12 +2374,12 @@ msgstr ""
 "\n"
 "Fortsett installasjon likevel?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2384,7 +2388,7 @@ msgstr ""
 "Én av pakkene kan ikke installeres:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2393,12 +2397,12 @@ msgstr ""
 "Noen av de forespurte pakkene kan ikke installeres:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "Du vil ødelegge systemet ditt hvis du fjerner pakken «%s»."
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2409,7 +2413,7 @@ msgstr ""
 "for at andre skal kunna oppgraderes:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2420,12 +2424,12 @@ msgstr ""
 "må fjernes for at andre skal bli oppgradert:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(kun test, fjerning vil egentlig ikke bli gjennomført)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2435,46 +2439,46 @@ msgstr ""
 "Du må være root for å installere følgende avhengigheter:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "For å oppfylle avhengigheter vil den følgende pakken bli fjernet"
 msgstr[1] "For å oppfylle avhengigheter vil de følgende %d pakkene bli fjernet"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(kun test, installasjon vil egentlig ikke bli gjennomført)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Det vil bli brukt %s mer diskplass."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Det ble frigjort %s diskplass."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Det ble frigjort %s diskplass."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Vil du fortsette med installering av pakken?"
 msgstr[1] "Vil du fortsette med installering av de %d pakkene?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Trykk Enter når det er klart..."
@@ -2919,13 +2923,13 @@ msgstr "  -f             – Tving oppdatering av «synthesis»/«hdlist».\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Bare superbruker kan oppdatere media."
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Ingenting å oppdatere (bruk «urpmi.addmedia» for å legge til et medie)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2934,17 +2938,17 @@ msgstr ""
 "Mangler oppføringen tsom skal oppdateres\n"
 "(en av %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "Ignorerer medie «%s»."
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "Aktiverer medie «%s»."
@@ -3213,6 +3217,9 @@ msgstr "Inga «hdlist» for medium «%s». Kan ikke vise resultat for pakkene «
 msgid "No changelog found\n"
 msgstr "Fant ingen endringslogg\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Oppdaterer medie...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "Kontrollerer %s-fila."
 
diff --git a/po/nl.po b/po/nl.po
index e7087ead..39c21fab 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-08 00:17+0200\n"
 "Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -25,22 +25,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Dutch\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-installatie"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fout opgetreden: kan bestand %s niet vinden, operatie wordt afgebroken"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -61,7 +61,7 @@ msgstr ""
 "\n"
 "Wat wilt u doen?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Doorgaan?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -94,22 +94,22 @@ msgstr ""
 "Mogelijk geeft u er de voorkeur aan het bestand slechts op te slaan. Wat is "
 "uw keuze?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Installeren"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Kies locatie om bestand in op te slaan"
@@ -222,12 +222,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Geen pakketten gespecificeerd"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Even geduld..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Dient 'root' te zijn"
@@ -258,42 +258,42 @@ msgstr ""
 "%s\n"
 "Toch verdergaan met installatie?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (op te waarderen)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr "(te installeren)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Pakketkeuze"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Eén van de volgende pakketten is benodigd:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Afbreken"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -305,7 +305,7 @@ msgstr ""
 "%s\n"
 "Toch verdergaan met installatie?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -313,7 +313,7 @@ msgstr ""
 "Om aan afhankelijkheden te voldoen, wordt het volgende pakket geïnstalleerd:"
 
 # Should use ngettext plural forms :-/
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -321,44 +321,51 @@ msgstr ""
 "Om aan de afhankelijkheden te voldoen worden de volgende pakketten "
 "geïnstalleerd:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakket, %d MB)"
 msgstr[1] "(%d pakketten, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Voorbereiden..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Gelieve het medium genaamd \"%s\" te plaatsen"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloaden van pakket `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...ontvangst mislukt: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Klaar"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -369,28 +376,27 @@ msgstr ""
 "%s\n"
 "Misschien moet u de urpmi database opwaarderen"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Installatie mislukt:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "De pakketten zijn reeds geïnstalleerd"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Installatie voltooid"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "verwijderen van %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi herstarten"
@@ -465,58 +471,52 @@ msgstr "Omgevingsmap %s bestaat niet"
 msgid "using specific environment on %s\n"
 msgstr "maakt gebruik van aangegeven omgeving op %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "kon rpmdb niet openen"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ongeldige rpm-bestandsnaam [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "bezig met ontvangen van rpm bestand [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...klaar met ontvangst"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ontvangst mislukt: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kon rpm-bestand [%s] niet benaderen"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "niet in staat spec-bestand %s te analyseren [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "kon rpm-bestand niet registreren"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Niet-compatibele architectuur voor rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "registreren van lokale pakketten is mislukt"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Deze operatie is verboden tijdens het uitvoeren in beperkte modus"
@@ -558,22 +558,22 @@ msgstr ""
 "standaard verwacht urpmf een regexp, u dient de optie \"--literal\" te "
 "gebruiken"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-map bestaat niet"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan %s niet gebruiken zonder %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan %s niet gebruiken samen met %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Te veel argumenten\n"
@@ -667,82 +667,87 @@ msgstr "%s mislukt: afgesloten met signaal %d"
 msgid "%s failed: exited with %d"
 msgstr "%s mislukt: afgesloten met %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "kopiëren is mislukt"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget ontbreekt\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl ontbreekt\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl is mislukt: download geannuleerd\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync ontbreekt\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh ontbreekt\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla ontbreekt\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Kan prozilla niet uitvoeren\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 ontbreekt\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% van %s voltooid, verwacht = %s, snelheid = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% voltooid, snelheid = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "ophalen van %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "%s opgehaald"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "onbekend protocol gedefinieerd voor %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "geen ``webfetch'' gevonden, ondersteund zijn: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "kon protocol niet verwerken: %s"
@@ -762,12 +767,12 @@ msgstr "pakket %s is niet gevonden."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[opnieuw verpakken]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -775,47 +780,47 @@ msgstr ""
 "transactie aangemaakt om te installeren op %s (verwijderen=%d, installeren=%"
 "d, vernieuwen=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "Niet in staat om transactie aan te maken."
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "kan rpm niet uit delta-rpm-pakket %s uitpakken"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "kon volgend pakket niet installeren: %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "verwijderen van onjuiste rpm (%s) uit %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "verwijderen van %s mislukt: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Verwijderen van pakket %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "bezig met verwijderen van pakket %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "geïnstalleerde rpms (%s) worden verwijderd uit %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Meer informatie over pakket %s"
@@ -860,18 +865,23 @@ msgstr "afbreken"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s-database is gesloten (een ander programma gebruikt hem al)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Installatie mislukt"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Toch proberen om door te gaan? (j/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -880,58 +890,58 @@ msgstr ""
 "Installatie mislukt, onjuiste rpms:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Het volgende pakket is voorzien van een onjuiste handtekening"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "De volgende pakketten bevatten een onjuiste handtekening"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wilt u doorgaan met de installatie?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "verwijderen van geïnstalleerde rpms (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribueren van %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "installeren van %s vanaf %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "installeren van %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr ""
 "Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Installatie trachten te forceren (--force)? (j/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pakketten zijn bijgewerkt"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Installatie is mogelijk"
@@ -1137,7 +1147,7 @@ msgstr "kopiëren van [%s] mislukt (bestand is verdacht klein)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "berekenen md5sum van ontvangen bronsynthesis"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "ophalen van [%s] mislukt (md5sum onjuist)"
@@ -1177,32 +1187,32 @@ msgstr "geen metadata gevonden voor medium \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "bronsynthesis van \"%s\" ontvangen..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "onderzoeken van publieke sleutelbestand van \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...sleutel %s uit publiek sleutelbestand van \"%s\" geïmporteerd"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kon publieke sleutelbestand van \"%s\" niet importeren"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "geen synthesis-bestand gevonden voor medium \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "bijgewerkt medium \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "ophalen van [%s] mislukt"
@@ -1217,94 +1227,99 @@ msgstr "opnieuw proberen met mirror %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Kan geen mirror vinden uit de mirrorlijst %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "geolocalisatie %s %.2f %.2f gevonden uit tijdzone %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "ophalen mirrorlijst van %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyJj"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Sorry, ongeldige keuze, probeer het nogmaals\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pakket"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versie"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Uitgave"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arch"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(aangeraden)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "medium \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "opdrachtregel"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1393,306 +1408,6 @@ msgstr "%s koppelen..."
 msgid "unmounting %s"
 msgstr "%s afkoppelen..."
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf versie %s\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik: urpmf [opties] patroon-expressie\n"
-
-#
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - geeft het versienummer van dit programma weer.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - specifieke omgeving gebruiken (meestal een foutrapport).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - gebruik de gegeven media niet, kommagescheiden.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - geen patronen vergelijken, argument als letterlijke "
-"reeks.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root  - gebruik andere hoofdmap (root) voor urpmi db & rpm-"
-"installatie.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - media sorteren uitgaand van kommagescheiden subreeksen.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib    - opgegeven pad gebruiken voor mediatoegang.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - geeft geen identieke regels weer.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - gebruik alleen bijwerkmedia.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 'uitgebreid verslag'-modus.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - onderscheid hoofd-/kleine letters in elk patroon "
-"negeren.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - onderscheid hoofd-/kleine letters in patronen honoreren "
-"(standaard).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - veldscheidingsteken veranderen (standaard ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Patroonuitdrukkingen:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - alle tekst geïnterpreteerd als regexp, tenzij -l wordt \n"
-"\t\t\t\t\tgebruikt.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - voeg perl code direct als perl -e toe.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binaire AND operator.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binaire OR operator.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unary NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - linker en rechter haakjes.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Lijst van tags:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf            - een printf-achtig uitvoerformaat gebruiken.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   voorbeeld: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch          - architectuur\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - buildhost ('bouwcomputer')\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - build-tijdstip\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - configuratieestanden\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - conflict-tags\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - pakketomschrijving\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distributie\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epoch\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - bestandsnaam van het pakket\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - geeft alle bestanden in het pakket weer\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - groep\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licentie\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name          - pakketnaam\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - obsoletes ('verouderd')-tags\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - pakketsamensteller.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - provides ('levert')-tags\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - requires ('vereisten')-tags\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - geïnstalleerde grootte.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - naam van de broncode-rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - geeft tag-suggesties\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - samenvatting\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor      - leverancier\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - de media waarin het pakket gevonden is\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - geeft de versie, uitgave en arch met naam.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Onjuist formaat: u mag maar één tag gebruiken met meerdere waarden"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "geen hdlist-bestand beschikbaar voor medium \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "geen synthesis beschikbaar voor medium \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "geen xml-info beschikbaar voor medium \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1711,7 +1426,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Geen pakket genaamd %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "De volgende pakketten bevatten %s: %s"
@@ -1721,47 +1436,47 @@ msgstr "De volgende pakketten bevatten %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Gebruik \"-a\" om ze allemaal te gebruiken"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "pakket(ten) %s gevonden in urpmi-db, maar geen ervan is geïnstalleerd"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakket %s is reeds geïnstalleerd"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "De pakketten %s zijn reeds geïnstalleerd"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "vanwege ontbrekende %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "vanwege reeds geïnstalleerde %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vanwege onvoldane %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer %s op te waarderen"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "Om %s te behouden"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1770,7 +1485,7 @@ msgstr ""
 "Het volgende pakket moet worden verwijderd om andere te kunnen opwaarderen:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1780,12 +1495,12 @@ msgstr ""
 "opwaarderen:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "in volgorde om %s te installeren"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "vanwege conflicten met %s"
@@ -1881,6 +1596,14 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - gebruik andere hoofdmap (root) voor rpm-verwijdering.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root  - gebruik andere hoofdmap (root) voor urpmi db & rpm-"
+"installatie.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1913,39 +1636,39 @@ msgstr ""
 "  -a             - selecteer alle pakketten die overeenkomen met de "
 "expressie.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Alleen de beheerder mag media verwijderen"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "onbekende pakketten"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "onbekend pakket"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Het verwijderen van het volgende pakket zal uw systeem verstoren:"
 msgstr[1] "Het verwijderen van de volgende pakketten zal uw systeem verstoren:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Niets te verwijderen"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Geen wezen te verwijderen"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1956,45 +1679,331 @@ msgstr[1] ""
 "Om aan de afhankelijkheden te voldoen, worden de volgende %d pakketten "
 "verwijderd"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(weespakket)"
 msgstr[1] "(weespakketten)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Eén pakket verwijderen?"
 msgstr[1] "%d Pakketten verwijderen?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "verwijdering van %s testen"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Verwijderen is mislukt"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Verwijderen is mogelijk"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf versie %s\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik: urpmf [opties] patroon-expressie\n"
+
+#
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - geeft het versienummer van dit programma weer.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - specifieke omgeving gebruiken (meestal een foutrapport).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - gebruik de gegeven media niet, kommagescheiden.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - geen patronen vergelijken, argument als letterlijke "
+"reeks.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - media sorteren uitgaand van kommagescheiden subreeksen.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib    - opgegeven pad gebruiken voor mediatoegang.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - geeft geen identieke regels weer.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - gebruik alleen bijwerkmedia.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 'uitgebreid verslag'-modus.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - onderscheid hoofd-/kleine letters in elk patroon "
+"negeren.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - onderscheid hoofd-/kleine letters in patronen honoreren "
+"(standaard).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - veldscheidingsteken veranderen (standaard ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Patroonuitdrukkingen:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - alle tekst geïnterpreteerd als regexp, tenzij -l wordt \n"
+"\t\t\t\t\tgebruikt.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - voeg perl code direct als perl -e toe.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binaire AND operator.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binaire OR operator.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unary NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - linker en rechter haakjes.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Lijst van tags:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf            - een printf-achtig uitvoerformaat gebruiken.\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   voorbeeld: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch          - architectuur\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - buildhost ('bouwcomputer')\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - build-tijdstip\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - configuratieestanden\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - conflict-tags\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - pakketomschrijving\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distributie\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epoch\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - bestandsnaam van het pakket\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - geeft alle bestanden in het pakket weer\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - groep\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licentie\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - pakketnaam\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - obsoletes ('verouderd')-tags\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - pakketsamensteller.\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - provides ('levert')-tags\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - requires ('vereisten')-tags\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - geïnstalleerde grootte.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - naam van de broncode-rpm.\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - geeft tag-suggesties\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - samenvatting\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - URL\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor      - leverancier\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - de media waarin het pakket gevonden is\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - geeft de versie, uitgave en arch met naam.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "niet-afgesloten uitdrukking (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Onjuist formaat: u mag maar één tag gebruiken met meerdere waarden"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "geen hdlist-bestand beschikbaar voor medium \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "geen synthesis beschikbaar voor medium \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "geen xml-info beschikbaar voor medium \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2358,36 +2367,31 @@ msgstr ""
 "Fout: %s lijkt als alleen-lezen gekoppeld te zijn.\n"
 "Gebruik --allow-force om de opdracht te forceren."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Bijwerken van media...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (op te waarderen)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (op te waarderen)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (te installeren)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (te installeren)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2396,12 +2400,12 @@ msgstr ""
 "Om aan de afhankelijkheid '%s' te voldoen, is één van de volgende pakketten "
 "nodig:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Wat is uw keuze? (1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2412,7 +2416,7 @@ msgstr ""
 "van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2423,7 +2427,7 @@ msgstr ""
 "van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2432,12 +2436,12 @@ msgstr ""
 "\n"
 "Toch doorgaan met de installatie?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2446,7 +2450,7 @@ msgstr ""
 "Een verlangd pakket kan niet worden geïnstalleerd:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2455,12 +2459,12 @@ msgstr ""
 "Enkele gevraagde pakketten kunnen niet worden geïnstalleerd:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "het verwijderen van %s zal uw systeem verstoren"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2471,7 +2475,7 @@ msgstr ""
 "moeten worden verwijderd om andere te kunnen opwaarderen:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2482,12 +2486,12 @@ msgstr ""
 "moeten worden verwijderd om andere te kunnen opwaarderen:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(alleen test, verwijdering zal niet daadwerkelijk plaatsvinden)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2498,46 +2502,46 @@ msgstr ""
 "afhankelijkheden te installeren:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Het volgende weespakket wordt verwijderd."
 msgstr[1] "De volgende weespakketten worden verwijderd."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(alleen test, installatie zal niet daadwerkelijk plaatsvinden)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s aan extra schijfruimte zal worden gebruikt."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s aan schijfruimte zal vrijkomen."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s aan pakketten zal worden opgehaald."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Verdergaan met de installatie van 1 pakket?"
 msgstr[1] "Verdergaan met de installatie van de %d pakketten?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Druk op Enter wanneer de koppeling tot stand is gebracht..."
@@ -3003,13 +3007,13 @@ msgstr "  -ff             - het bijwerken van synthesis echt afdwingen\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Alleen de beheerder mag media bijwerken"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "niets om te verversen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3018,17 +3022,17 @@ msgstr ""
 "de invoer om op te waarderen ontbreekt\n"
 "(één van %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "negeren van medium \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "activeren van medium \"%s\""
@@ -3314,6 +3318,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Geen wijzigingslogboek gevonden\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Bijwerken van media...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "onderzoeken van bestand %s"
 
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 5a2a62b9..bfffab83 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-03-23 21:55+0530\n"
 "Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
 "Language-Team: Panjabi <fedora-trans-pa@redhat.com>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM ਇੰਸਟਾਲੇਸ਼ਨ"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "ਠੀਕ ਹੈ(_O)"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 "ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -68,7 +68,7 @@ msgstr ""
 "\n"
 "ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -83,22 +83,22 @@ msgstr ""
 "\n"
 "ਤੁਸੀਂ ਇਸ ਨੂੰ ਸਿਰਫ਼ ਸੰਭਾਲ ਵੀ ਸਕਦੇ ਹੋ। ਤੁਹਾਡੀ ਚੋਣ ਕੀ ਹੈ?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "ਇੰਸਟਾਲ(_I)"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "ਰੱਦ(_C)"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "ਫਾਇਲ਼ ਸੰਭਾਲਣ ਲਈ ਟਿਕਾਣਾ ਦਿਓ"
@@ -201,12 +201,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "ਪ੍ਰਬੰਧਕ (root) ਬਣਨਾ ਪਵੇਗਾ"
@@ -237,42 +237,42 @@ msgstr ""
 "%s\n"
 "ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਦੀ ਲੋੜ ਹੈ:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "ਛੱਡੋ(_A)"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -283,13 +283,13 @@ msgstr ""
 "%s\n"
 "ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "ਨਿਰਭਰਤਾ ਹੱਲ ਕਰਨ ਲਈ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ (%d ਮੈਬਾ)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -297,44 +297,51 @@ msgstr ""
 "ਨਿਰਭਰਤਾ ਸਮਾਪਤ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:\n"
 "%s\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ਸਰੋਤ ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "ਕਿਪਾ ਕਰਕੇ \"%s\" ਨਾਂ ਮਾਧਿਅਮ [%s] ਜੰਤਰ ਵਿੱਚ ਪਾਓ"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "ਸਮਾਪਤ(_D)"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -345,28 +352,27 @@ msgstr ""
 "%s\n"
 "ਤੁਸੀਂ ਆਪਣੇ urpmi ਡਾਟਾਬੇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰ ਸਕਦੇ ਹੋ"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "ਇੰਸਟਾਲੇਸ਼ ਸਮਾਪਤ"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi ਮੁੜ ਚਾਲੂ"
@@ -440,58 +446,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "%s ਤੇ ਖਾਸ ਵਾਤਾਵਰਣ ਦੀ ਵਰਤੋਂ ਕਰਕੇ\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb ਖੋਲਣ ਲਈ ਅਸਫਲ"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ਗਲਤ rpm ਫਾਇਲ ਨਾਂ [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "rpm ਫਾਇਲ [%s] ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...ਪ੍ਰਾਪਤੀ ਹੋਈ"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm ਫਾਇਲ [%s] ਖੋਲਣ ਲਈ ਅਸਫਲ"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ਫਾਇਲ [%s] ਵਿੱਚ \"%s\" ਨੂੰ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm ਫਾਇਲ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "ਸਥਾਨਕ ਪੈਕੇਜ ਰਜਿਸਟਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -531,22 +531,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -638,82 +638,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s ਲਈ ਅਣਜਾਣ ਪ੍ਰੋਟੋਕਾਲ"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "ਕੋਈ webfetch ਨਹੀਂ ਲੱਭਿਆ ਹੈ, ਸਹਿਯੋਗ webfetch ਹਨ: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ ਹੈਂਡਲ ਕਰਨ ਲਈ ਅਸਫਲ: %s"
@@ -733,58 +738,58 @@ msgstr "ਪੈਕੇਜ %s ਨਹੀਂ ਲੱਭਿਆ ਹੈ।"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ਮਾਧਿਅ \"%s\" ਤੋਂ rpm ਫਾਇਲਾਂ ਪ੍ਰਾਪਤ ਕੀਤੀਆਂ ਜਾਦੀਆਂ ਹਨ..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "%s ਤੇ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸੰਚਾਰ ਬਣਾਇਆ (ਹਟਾਏ=%d, ਇੰਸਟਾਲ=%d, ਨਵੀਨੀਕਰਨ=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "ਸੰਚਾਰ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ਪੈਕੇਜ %s ਹਟਾਉਣ ਲਈ ਅਸਫਲ"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "ਪੈਕੇਜ %s ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ"
@@ -829,75 +834,80 @@ msgstr "ਚੇਤਾਵਨੀ"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "%s ਵੰਡਿਆ ਜਾਦਾ ਹ"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "ਬਿਨਾਂ ਨਿਰਭਰਤਾਂ ਦੇ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਕੋਸ਼ਿਸ ਕਰਨੀ ਹੈ? (y/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਧੱਕੇ ਨਾਲ ਵਰਤਣਾ ਹੈ (--force)? (y/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਭਵ ਹੈ"
@@ -1101,7 +1111,7 @@ msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (ਫਾਇਲ ਸ਼ੱਕੀ ਰੂਪ
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "ਪ੍ਰਾਪਤ ਸਰੋਤ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਣ) ਦਾ md5sum ਕੱਢਿਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (md5sum ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ)"
@@ -1141,32 +1151,32 @@ msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿ
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" ਲਈ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਫਾਇਲ ਵੇਖੀ ਜਾਦੀ ਹੈ..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\" ਦੀ ਸਰਵਜਨਕ ਕੁੰਜੀ ਤੋਂ %s ਕੁੰਜੀ ਆਯਾਤੀ ਕੀਤੀ"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਆਯਾਤ ਕਰਨੀ ਅਸਫਲ"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "ਮਾਧਿਅਮ %s ਸ਼ਾਮਲ"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1181,94 +1191,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "[%s] ਤੋਂ rpm ਫਾਇਲਾਂ ਪੜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "ਮੁਆਫੀ, ਗਲਤ ਚੋਣ, ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "ਖੋਜ"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1351,298 +1366,6 @@ msgstr "%s ਮਾਊਟ ਕੀਤਾ ਜਾਦਾ ਹੈ"
 msgid "unmounting %s"
 msgstr "%s ਅਨਮਾਊਟ ਕੀਤਾ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf ਵਰਜਨ %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"ਇਹ ਸਾਫਟਵੇਅਰ ਮੁਫਤ ਹੈ ਅਤੇ ਇਸ ਨੂੰ ਮੁੜ GNU GPL ਸ਼ਰਤਾਂ ਅਧੀਨ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ\n"
-"\n"
-"ਵਰਤੋਂ:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - print this help message.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, fuzzy, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - do not use the given media, separated by comma.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - use another root for rpm installation.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - do not print identical lines twice.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - use only update media.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose mode.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignore case distinctions in patterns.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - ignore case distinctions in patterns.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include perl code directly as perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -q             - quiet mode.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - right parenthesis to close group expression.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"ਮੁੜ ਸੰਭਾਲ ਵਾਲੇ ਡਾਟੇ ਦੀ ਸੂਚੀ:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  -g             - print groups with name also.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    %s ਮੂਲ ਹੈ।\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - print tag url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - print tag buildhost: build host.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "ਕੇਸੋਲ ਸੰਰਚਨਾ ਮੈਡੀਊਲ"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - print tag conflicts: all conflicts.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - print tag description: description.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - print tag epoch: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - print only package names.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - list files in package.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - print tag group: group.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - print only package names.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - print only package names.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - print tag packager: packager.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - print tag provides: all provides.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - print tag requires: all requires.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - print tag size: size.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - print tag summary: summary.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - print tag url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - verbose mode.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - list files in package.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - print version, release and arch with name.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਸੰਸਲੇਸ਼ਕ ਫਾਇਲ ਬਣਾਈ"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1659,7 +1382,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਵਿੱਚ %s: %s"
@@ -1669,47 +1392,47 @@ msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਵਿੱਚ %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "ਨਾ-ਪੂਰਾ %s ਹੋਣ ਕਰਕੇ"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s ਨੂੰ ਵਧਾਉਣ ਦੀ ਕੋਸ਼ਿਸ ਦੌਰਾਨ"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s ਰੱਖਣ ਲਈ"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1718,7 +1441,7 @@ msgstr ""
 "ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1727,12 +1450,12 @@ msgstr ""
 "ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s ਨਾਲ ਅਪਵਾਦ ਕਰਕੇ"
@@ -1823,6 +1546,12 @@ msgstr "  --packager     - print tag packager: packager.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - use another root for rpm removal.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - use another root for rpm installation.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1852,39 +1581,39 @@ msgstr "  --verbose      - verbose mode.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕ ਹੀ ਪੈਕੇਜ ਹਟਾ ਸਕਦੇ ਹਨ"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "ਅਣਜਾਣ ਪੈਕੇਜ"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "ਅਣਜਾਣ ਪੈਕੇਜ"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "ਪੈਕੇਜ %s ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ"
 msgstr[1] "ਪੈਕੇਜ %s ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "ਹਟਾਉਣ ਲਈ ਕੁਝ ਨਹੀਂ"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "ਹਟਾਉਣ ਲਈ ਕੁਝ ਨਹੀਂ"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1892,45 +1621,325 @@ msgid_plural ""
 msgstr[0] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
 msgstr[1] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "ਅਣਜਾਣ ਪੈਕੇਜ"
 msgstr[1] "ਅਣਜਾਣ ਪੈਕੇਜ"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 msgstr[1] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "\"%s\" ਨੂੰ ਹਟਾਉਣਯੋਗ ਜੰਤਰ ਵਾਂਗ ਲਵੋ"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "ਹਟਾਉਣਾ ਅਸਫਲ"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "ਹਟਾਉਣਾ ਅਸਫਲ"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf ਵਰਜਨ %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"ਇਹ ਸਾਫਟਵੇਅਰ ਮੁਫਤ ਹੈ ਅਤੇ ਇਸ ਨੂੰ ਮੁੜ GNU GPL ਸ਼ਰਤਾਂ ਅਧੀਨ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ\n"
+"\n"
+"ਵਰਤੋਂ:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - print this help message.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, fuzzy, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - do not use the given media, separated by comma.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - do not print identical lines twice.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - use only update media.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose mode.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignore case distinctions in patterns.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - ignore case distinctions in patterns.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include perl code directly as perl -e.\n"
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr ""
+"  -a             - binary AND operator, true if both expression are true.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -q             - quiet mode.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - right parenthesis to close group expression.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"ਮੁੜ ਸੰਭਾਲ ਵਾਲੇ ਡਾਟੇ ਦੀ ਸੂਚੀ:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  -g             - print groups with name also.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    %s ਮੂਲ ਹੈ।\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - print tag url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - print tag buildhost: build host.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "ਕੇਸੋਲ ਸੰਰਚਨਾ ਮੈਡੀਊਲ"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - print tag conflicts: all conflicts.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - print tag description: description.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - print tag epoch: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - print only package names.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - list files in package.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - print tag group: group.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - print only package names.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - print only package names.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - print tag packager: packager.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - print tag provides: all provides.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - print tag requires: all requires.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - print tag size: size.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - print tag summary: summary.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - print tag url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - verbose mode.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - list files in package.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - print version, release and arch with name.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਸੰਸਲੇਸ਼ਕ ਫਾਇਲ ਬਣਾਈ"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2274,48 +2283,43 @@ msgstr ""
 "ਗਲਤੀ: %s ਸ਼ਾਇਦ ਪੜਨ ਲਈ ਹੀ ਮਾਊਟ ਕੀਤੀ ਗਈ ਹੈ।\n"
 "ਧੱਕੇ ਕਰਨ ਲਈ --allow-force ਵਰਤੋਂ।"
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "ਤੁਹਾਡੀ ਚੋਣ ਕੀ ਹੈ? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2326,7 +2330,7 @@ msgstr ""
 "ਇੰਸਟਾਲ ਕੀਤਿਆਂ ਤੋਂ ਪੁਰਾਣੇ ਹਨ:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2337,19 +2341,19 @@ msgstr ""
 "ਇੰਸਟਾਲ ਕੀਤਿਆਂ ਤੋਂ ਪੁਰਾਣੇ ਹਨ:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "ਕਿਸੇ ਤਰਾਂ ਜਾਰੀ ਰਹੋ?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2358,7 +2362,7 @@ msgstr ""
 "ਮੰਗੇ ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2367,12 +2371,12 @@ msgstr ""
 "ਮੰਗੇ ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "ਪੈਕੇਜ %s ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2383,7 +2387,7 @@ msgstr ""
 "ਹੋਰਾਂ ਦੇ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2394,12 +2398,12 @@ msgstr ""
 "ਹੋਰਾਂ ਦੇ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2409,46 +2413,46 @@ msgstr ""
 "ਤੁਹਾਨੂੰ ਇਹ ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ ਪ੍ਰਬੰਧਕ (root) ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
 msgstr[1] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਤਿਆਰ ਹੋਣ ਤੇ Enter ਦਬਾਓ..."
@@ -2888,12 +2892,12 @@ msgstr "  -f             - force generation of hdlist files.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕਾਂ ਨੂੰ ਹੀ ਨਵੀਨੀਕਰਨ ਮਾਧਿਅਮ ਵਰਤਣ ਦੀ ਇਜ਼ਾਜਤ ਹੈ"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ਕੁਝ ਵੀ ਨਵੀਨੀਕਰਨ ਨਹੀਂ (ਇੱਕ ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ urpmi.addmedia ਵਰਤੋ)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2902,17 +2906,17 @@ msgstr ""
 "ਨਵੀਨੀਕਰਨ ਲਈ ਇੰਦਰਾਜ਼ ਗੁੰਮ ਹੈ\n"
 "(%s ਵਿੱਚੋਂ ਇੱਕ)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ਮਾਧਿਅਮ %s ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "ਮਾਧਿਅਮ %s ਯੋਗ ਕੀਤਾ ਜਾਦਾ ਹੈ"
diff --git a/po/pl.po b/po/pl.po
index da45866a..2b610400 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -18,32 +18,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-12-04 11:02+0100\n"
-"Last-Translator: Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@mandriva.pl>\n"
+"Last-Translator: Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz."
+"bednarski@mandriva.pl>\n"
 "Language-Team:  <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Instalacja pakietów RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
-msgstr "Błąd: odnalezienie pliku %s było niemożliwe, operacja zostanie anulowana"
+msgstr ""
+"Błąd: odnalezienie pliku %s było niemożliwe, operacja zostanie anulowana"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -64,7 +67,7 @@ msgstr ""
 "\n"
 "Co chcesz zrobić?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -79,7 +82,7 @@ msgstr ""
 "\n"
 "Kontynuować?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -94,22 +97,22 @@ msgstr ""
 "\n"
 "Być może będziesz mieć ochotę go zapisać. Jaki jest twój wybór?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "Zainstaluj"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Wybierz miejsce zapisania pliku"
@@ -153,12 +156,15 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automatycznie wybiera pakiety aktualizujące system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatycznie wybiera pakiety aktualizujące system.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - wymusza wywoływanie nawet przy braku niektórych "
 "pakietów.\n"
@@ -182,12 +188,14 @@ msgstr ""
 #: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
+msgstr ""
+"  -p             - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
 
 #: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
+msgstr ""
+"  -P             - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
 
 #: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
@@ -205,7 +213,8 @@ msgstr ""
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  -  używa tylko podanych nośników podczas wyszukiwania "
 "wymaganych pakietów.\n"
@@ -215,12 +224,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Nie wybrano pakietów"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Proszę czekać..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Tylko root ma prawo do tego działania"
@@ -251,42 +260,42 @@ msgstr ""
 "%s\n"
 "Czy kontynuować mimo to?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (do aktualizacji)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (do zainstalowania)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Wybór pakietów"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Wymagany jest jeden z następujących pakietów:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Przerwij"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -297,17 +306,21 @@ msgstr ""
 "%s\n"
 "Czy kontynuować mimo to?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "W celu spełnienia zależności zostanie zainstalowany następujący pakiet:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"W celu spełnienia zależności zostanie zainstalowany następujący pakiet:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "W celu spełnienia zależności zostaną zainstalowane następujące pakiety:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"W celu spełnienia zależności zostaną zainstalowane następujące pakiety:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -315,37 +328,44 @@ msgstr[0] "(%d pakiet, %d MB)"
 msgstr[1] "(%d pakietów, %d MB)"
 msgstr[2] "(%d pakietów, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nie można pobrać pakietów źródłowych, zaniechanie"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Przygotowywanie..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Włóż nośnik o nazwie \"%s\" "
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Pobieranie pakietu \"%s\"..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...pobieranie nie powiodło się: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "Gotowe"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -356,28 +376,27 @@ msgstr ""
 "%s\n"
 "Może zachodzić potrzeba aktualizacji bazy danych urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalacja nie powiodła się:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Wszystko zostało już zainstalowane"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalacja zakończona"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "usuwanie %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "ponownie uruchamianie urpmi"
@@ -451,58 +470,52 @@ msgstr "Katalog %s nie istnieje"
 msgid "using specific environment on %s\n"
 msgstr "używając określonego środowiska na %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "nie można otworzyć bazy danych rpm"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "niepoprawna nazwa pliku rpm [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "pobieranie pliku rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...pobieranie zakończone"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pobieranie nie powiodło się: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nie można uzyskać dostępu do pliku rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "nie można przetworzyć pliku konfiguracyjnego %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "nie można zarejestrować pliku rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Niezgodna architektura dla pakietu rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "błąd w trakcie rejestrowania pakietów lokalnych"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Operacja niedozwolona podczas pracy w trybie restrykcyjnym"
@@ -542,22 +555,22 @@ msgstr "brak wyrażenia do zamknięcia"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "w domyślnym ustawieniu urpmf oczekuje regexp. Użyj opcji \"--literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Katalog chroot nie istnieje"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Nie można użyć %s bez %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Nie można użyć %s z %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Zbyt wiele argumentów\n"
@@ -653,82 +666,87 @@ msgstr "%s nie powiodło się: zakończono z sygnałem %d"
 msgid "%s failed: exited with %d"
 msgstr "%s nie powiodło się: zakończono z %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "kopiowanie zakończone niepowodzeniem"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "brak programu wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "brak programu curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "wystąpił błąd w programie curl: pobieranie przerwane\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "brak programu rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "brak programu ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "brak programu prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Uruchomienie programu prozilla było niemożliwe\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "brak programu aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% z %s zostało pobrane, ETA = %s, prędkość = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% zakończono, prędkość = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "pobieranie %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "...pobrano %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "nieznany protokół zdefiniowany dla %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nie znaleziono narzędzia do pobierania stron, obsługiwanymi są: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nie można obsłużyć protokołu: %s"
@@ -748,59 +766,60 @@ msgstr "pakiet %s nie został odnaleziony."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "pobieranie plików rpm z nośnika \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[ponowne tworzenie pakietu]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "utworzono transakcję dla instalacji na %s (usuwanie=%d, instalacja=%d, "
 "aktualizacja=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "nie można utworzyć transakcji"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "nie można wypakować pakietu rpm z pakietu delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "nie można zainstalować pakietu %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "usuwanie niepoprawnego pakietu rpm (%s) z %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "usuwanie %s nie powiodło się: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Usuwanie pakietu %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "usuwanie pakietu %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "usuwanie zainstalowanych pakietów rpm (%s) z %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Więcej informacji o pakiecie %s"
@@ -845,18 +864,23 @@ msgstr "przerywanie"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s baza danych zablokowana (jest używana przez inny program)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacja nie powiodła się"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Czy chcesz kontynuować mimo to? (t/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -865,57 +889,57 @@ msgstr ""
 "Instalacja nie powiodła się. Nieprawidłowe pakiety rpm:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Poniższy pakiet ma niepoprawny podpis"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Następujące pakiety zawierają niepoprawne podpisy"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Czy chcesz kontynuować instalację ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "usuwanie zainstalowanych pakietów rpm (%s) "
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "rozpowszechnianie %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalowanie %s z %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instalowanie %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Próbować instalować bez sprawdzania zależności? (t/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Czy chcesz spróbować wymusić instalację (--force)? (t/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Oprogramowanie jest zaktualizowane"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalacja jest możliwa"
@@ -928,7 +952,8 @@ msgstr "ostrzeżenie: md5sum dla %s jest niedostępna w pliku MD5SUM"
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "wirtualny nośnik \"%s\" powinien posiadać jasny URL, zignorowano nośnik"
+msgstr ""
+"wirtualny nośnik \"%s\" powinien posiadać jasny URL, zignorowano nośnik"
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -1076,7 +1101,8 @@ msgstr "zmiana konfiguracji zakończona"
 #: ../urpm/media.pm:1103
 #, c-format
 msgid "Error generating names file: dependency %d not found"
-msgstr "Błąd podczas generowania pliku z nazwami: nie odnaleziono zależności %d"
+msgstr ""
+"Błąd podczas generowania pliku z nazwami: nie odnaleziono zależności %d"
 
 #: ../urpm/media.pm:1124
 #, c-format
@@ -1123,7 +1149,7 @@ msgstr "kopiowanie [%s] zakończone niepowodzeniem (plik jest podejrzanie mały)
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "obliczanie sumy md5 pobranego pliku syntezy"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "pobieranie [%s] zakończone niepowodzeniem (niezgodna suma md5)"
@@ -1163,32 +1189,32 @@ msgstr "nie znaleziono meta informacji dla nośnika \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "pobieranie pliku syntezy związanego z \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "sprawdzanie pliku klucza publicznego związanego z \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...zaimportowany klucz %s z klucza publicznego związanego z \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nie można zaimportować pliku klucza publicznego związanego z \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nie znaleziono pliku syntezy dla nośnika \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "zaktualizowany nośnik %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "pobieranie [%s] nie powiodło się"
@@ -1203,96 +1229,101 @@ msgstr "ponowna próba połączenia z serwerem %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Odnalezienie serwera na liście serwerów %s nie było możliwe"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 "odnaleziono lokalizację geograficzną %s %.2f %.2f na podstawie strefy "
 "czasowej %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "pobieranie listy serwerów z %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Tt"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (t/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Niestety, niepoprawny wybór, spróbuj ponownie\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pakiet"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Wersja"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Wydanie"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Architektura"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(sugerowany)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "nośnik \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "wiersz poleceń"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1382,300 +1413,6 @@ msgstr "montowanie %s"
 msgid "unmounting %s"
 msgstr "odmontowywanie %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf wersja %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
-"licencji  GNU GPL.\n"
-"\n"
-"użycie: urpmf [opcje] pattern-expression\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version         - wyświetla numer wersji tego programu.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - używa określonego środowiska (typowo raport błędów).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - bez używania podanych nośników, rozdzielonych "
-"przecinkami.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - nie porównuj wzorców, użyj argumentu ciągu dosłownie.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - używa innego katalogu głównego  bazy danych urpmi i "
-"instalacji rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortuje nośniki w zależności od podciągów rozdzielonych\n"
-"                   przecinkami.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - użyj podanej ścieżki do nośnika\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - używa podanego pliku syntezy zamiast bazy urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - bez wyświetlania identycznych wierszy.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - tryb komunikatywny.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignoruje wielkość liter we wszystkich wzorcach.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - bierze pod uwagę wielkość liter we wszystkich wzorcach "
-"(domyślnie).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - zmień separator pola (domyślny to ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Wyrażenia wzorcowe:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - jakikolwiek tekst jest przetwarzany jako regexp, do "
-"chwili wykorzystania -l .\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - dołącza kod perla bezpośrednio jako perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operator binarny AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -a             - operator binarny AND.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !             - modyfikator NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )              - lewy i prawy nawias.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Lista znaczników:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - określa format wyjścia w stylu funkcji printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   przykład: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - architektura\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - czas utworzenia\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - pliki konfiguracyjne\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - znaczniki konfliktów.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - opis pakietu.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - dystrybucja\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - iteracja\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename      - nazwa pakietu.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - lista plików zawartych w pakiecie\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - grupa\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licencja\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name          - nazwa pakietu\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - wszystkie przestarzałe znaczniki\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - osoba tworząca pakiet\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - znacznik provides: wszystkie. pakiety.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - wszystkie zależności.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - rozmiar\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nazwa pakietu rpm ze źródłami\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - znaczniki z sugestiami\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - podsumowanie\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --URL          - adres URL\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - dostawca\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - nośnik na którym znajduje się pakiet\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Nieprawidłowy format: możesz używać tylko znaczniki wielowartościowe"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "brak pliku syntezy dla nośnika \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "brak informacji xml dla nośnika \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1685,7 +1422,8 @@ msgstr ""
 
 #: ../urpm/select.pm:32
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 "urpmi zostało uruchomione ponownie. Lista preferowanych pakietów uległa "
 "zmianie: %s vs %s"
@@ -1695,7 +1433,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Brak pakietu o nazwie %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Następujące pakiety zawierają %s: %s"
@@ -1705,49 +1443,49 @@ msgstr "Następujące pakiety zawierają %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Użyj opcji \"-a\", aby wykorzystać wszystkie"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 "odnaleziono pakiet(y) %s w bazie danych urpmi, ale żaden nie jest "
 "zainstalowany"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakiet %s jest już zainstalowany w systemie"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pakiet %s jest już zainstalowany w systemie"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "z powodu brakującego %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "ponieważ w systemie zainstalowano %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "z powodu niesatysfakcjonującego pakietu %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "próba ulepszenia %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "w celu zachowania pakietu %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1756,7 +1494,7 @@ msgstr ""
 "Poniższy pakiet musi zostać usunięte aby zaktualizować inne:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1765,12 +1503,12 @@ msgstr ""
 "Poniższe pakiety muszą być usunięte aby zaktualizować inne:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "w celu zainstalowania pakietu %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "z powodu kolizji z pakietem %s"
@@ -1864,6 +1602,14 @@ msgstr "  --repackage    - przebuduj pakiet przed usunięciem\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - używa innego katalogu głównego do usunięcia rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - używa innego katalogu głównego  bazy danych urpmi i "
+"instalacji rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1893,22 +1639,22 @@ msgstr "  --verbose, -v  - tryb komunikatywny.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - wybiera wszystkie pasujące pakiety.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Tylko administrator ma prawo usuwać pakiety"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "nieznane pakiety"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "nieznany pakiet"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1916,25 +1662,26 @@ msgstr[0] "Usunięcie poniższego pakietu spowoduje uszkodzenie systemu:"
 msgstr[1] "Usunięcie poniższych pakietów spowoduje uszkodzenie systemu:"
 msgstr[2] ""
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Brak elementów do usunięcia"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Brak osieroconych pakietów do usunięcia"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "W celu spełnienia zależności zostanie usunięty następujący pakiet"
 msgstr[1] "W celu spełnienia zależności  usunięte zostaną %d pakiety"
 msgstr[2] "W celu spełnienia zależności  usunięte zostaną %d pakiety"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1942,7 +1689,7 @@ msgstr[0] "(osierocony pakiet)"
 msgstr[1] "(osierocone pakiety)"
 msgstr[2] "nieznany pakiet"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1950,31 +1697,316 @@ msgstr[0] "Usunąć pakiet %d?"
 msgstr[1] "Usunąć pakiety %d?"
 msgstr[2] "Usunąć pakiet %d?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (t/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "testowanie usunięcia %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Usuwanie zakończone niepowodzeniem"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Usunięcie jest możliwe"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf wersja %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
+"licencji  GNU GPL.\n"
+"\n"
+"użycie: urpmf [opcje] pattern-expression\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version         - wyświetla numer wersji tego programu.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - używa określonego środowiska (typowo raport błędów).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - bez używania podanych nośników, rozdzielonych "
+"przecinkami.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - nie porównuj wzorców, użyj argumentu ciągu dosłownie.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sortuje nośniki w zależności od podciągów rozdzielonych\n"
+"                   przecinkami.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - użyj podanej ścieżki do nośnika\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - używa podanego pliku syntezy zamiast bazy urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - bez wyświetlania identycznych wierszy.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - tryb komunikatywny.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignoruje wielkość liter we wszystkich wzorcach.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - bierze pod uwagę wielkość liter we wszystkich wzorcach "
+"(domyślnie).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - zmień separator pola (domyślny to ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Wyrażenia wzorcowe:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - jakikolwiek tekst jest przetwarzany jako regexp, do "
+"chwili wykorzystania -l .\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - dołącza kod perla bezpośrednio jako perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operator binarny AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -a             - operator binarny AND.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !             - modyfikator NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )              - lewy i prawy nawias.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Lista znaczników:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - określa format wyjścia w stylu funkcji printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   przykład: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - architektura\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+"  --buildhost    - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - czas utworzenia\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - pliki konfiguracyjne\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - znaczniki konfliktów.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - opis pakietu.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - dystrybucja\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - iteracja\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename      - nazwa pakietu.\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - lista plików zawartych w pakiecie\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - grupa\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licencja\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - nazwa pakietu\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - wszystkie przestarzałe znaczniki\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - osoba tworząca pakiet\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - znacznik provides: wszystkie. pakiety.\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - wszystkie zależności.\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - rozmiar\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nazwa pakietu rpm ze źródłami\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - znaczniki z sugestiami\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - podsumowanie\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --URL          - adres URL\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - dostawca\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - nośnik na którym znajduje się pakiet\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "niezakończone wyrażenie (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Nieprawidłowy format: możesz używać tylko znaczniki wielowartościowe"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "brak pliku syntezy dla nośnika \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "brak informacji xml dla nośnika \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1983,7 +2015,8 @@ msgstr "  --auto-update  - aktualizuje nośniki i aktualizuje system.\n"
 #: ../urpmi:82
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "    --no-md5sum    - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
+msgstr ""
+"    --no-md5sum    - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
 
 #: ../urpmi:83
 #, c-format
@@ -2014,7 +2047,8 @@ msgstr ""
 #: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
-msgstr "  --install-src  - instalacja tylko pakietów źródłowych (bez binariów).\n"
+msgstr ""
+"  --install-src  - instalacja tylko pakietów źródłowych (bez binariów).\n"
 
 #: ../urpmi:88 ../urpmq:56
 #, c-format
@@ -2059,7 +2093,8 @@ msgstr "  --install-src  - instaluje tylko pakiet źródłowy (bez binariów).\n
 #: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - zaczyna od usuwania plików rpm z pamięci podręcznej.\n"
+msgstr ""
+"  --clean        - zaczyna od usuwania plików rpm z pamięci podręcznej.\n"
 
 #: ../urpmi:100
 #, c-format
@@ -2068,7 +2103,8 @@ msgstr "  --noclean      - zachowuje pliki rpm w pamięci podręcznej.\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 "  --replacepkgs  - wymuś instalację pakietów, które znajdują się już w "
 "systemie.\n"
@@ -2199,7 +2235,8 @@ msgstr "  --excludedocs  - wyłącza pliki dokumentacji.\n"
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - anuluje sprawdzania miejsca na dysku przed instalacją.\n"
+msgstr ""
+"  --ignoresize   - anuluje sprawdzania miejsca na dysku przed instalacją.\n"
 
 #: ../urpmi:139
 #, c-format
@@ -2267,7 +2304,8 @@ msgstr "  --debug        - tryb bardzo komunikatywny..\n"
 #: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  nazwy lub pliki rpm podane w wierszu poleceń zostaną zainstalowane.\n"
+msgstr ""
+"  nazwy lub pliki rpm podane w wierszu poleceń zostaną zainstalowane.\n"
 
 #: ../urpmi:183
 #, c-format
@@ -2286,7 +2324,8 @@ msgstr ""
 #: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
-msgstr "Nie można instalować pakietów binarnych przy włączonej opcji --install-src"
+msgstr ""
+"Nie można instalować pakietów binarnych przy włączonej opcji --install-src"
 
 #: ../urpmi:221
 #, c-format
@@ -2300,7 +2339,8 @@ msgstr "domyślnie z opcją --buildrequires"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "użyj opcji --buildrequires lub --install-src, domyślna opcja to --"
 "buildrequires"
@@ -2328,48 +2368,44 @@ msgstr ""
 "Błąd: wygląda na to, że %s został zamontowany tylko w trybie do odczytu.\n"
 "Użyj opcji --allow-force aby wymusić działanie."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Aktualizowanie nośnika...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (do aktualizacji)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (do aktualizacji)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (do zainstalowania)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (do zainstalowania)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
-msgstr "W celu spełnienia zależności '%s' niezbędny jest jeden z poniższych pakietów:"
+msgstr ""
+"W celu spełnienia zależności '%s' niezbędny jest jeden z poniższych pakietów:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Jaki jest Twój wybór? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2381,7 +2417,7 @@ msgstr ""
 " w systemie:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2392,7 +2428,7 @@ msgstr ""
 "zależności\n"
 "z pakietami, które są starsze niż aktualnie zainstalowane w systemie:%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2401,12 +2437,12 @@ msgstr ""
 "\n"
 "Czy kontynuować mimo to?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2415,7 +2451,7 @@ msgstr ""
 "Wybrany pakiet nie może zostać zainstalowany:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2424,12 +2460,12 @@ msgstr ""
 "Niektóre z wybranych pakietów nie mogą zostać zainstalowane:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "usuwanie pakietu %s spowoduje uszkodzenie systemu"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2440,7 +2476,7 @@ msgstr ""
 "musi zostać usunięty aby zaktualizować inne:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2451,12 +2487,12 @@ msgstr ""
 "muszą zostać usunięte aby zaktualizować inne:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(to tylko test, usunięcie nie zostanie przeprowadzone)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2467,7 +2503,7 @@ msgstr ""
 "buildrequires.\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2475,27 +2511,27 @@ msgstr[0] "Zostanie usunięty następujący osierocony pakiet."
 msgstr[1] "Zostaną usunięte następujące osierocone pakiety."
 msgstr[2] ""
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(to tylko test, instalacja nie będzie wykonana)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Zostanie wykorzystany dodatkowy obszar na dysku: %s"
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Zostanie zwolniony obszar na dysku: %s."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Zostanie pobranych %s pakietów."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2503,12 +2539,12 @@ msgstr[0] "Rozpocząć instalację jednego pakietu? "
 msgstr[1] "Rozpocząć instalację %d pakietów?"
 msgstr[2] "Rozpocząć instalację 1 pakietu? (%d MB)"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Naciśnij Enter po zamontowaniu..."
@@ -2627,7 +2663,8 @@ msgstr ""
 #: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  - z --distrib, prośba o potwierdzenie dla każdego nośnika\n"
+msgstr ""
+"  --interactive  - z --distrib, prośba o potwierdzenie dla każdego nośnika\n"
 
 #: ../urpmi.addmedia:76
 #, c-format
@@ -2651,7 +2688,8 @@ msgstr "  --virtual      - tworzy nośniki, które są zawsze aktualne,\n"
 #: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
+msgstr ""
+"  --no-md5sum    - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
 
 #: ../urpmi.addmedia:81
 #, c-format
@@ -2708,7 +2746,8 @@ msgstr "Utworzenie pliku konfiguracyjnego było niemożliwe [%s]"
 #: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "nie ma potrzeby podawania <ścieżki względnej do syntezy> z opcją --distrib"
+msgstr ""
+"nie ma potrzeby podawania <ścieżki względnej do syntezy> z opcją --distrib"
 
 #: ../urpmi.addmedia:144
 #, c-format
@@ -2765,7 +2804,8 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - pokazuje listę zdarzeń wykonanych od wskazanej daty/przez "
 "określony okres\n"
@@ -2773,7 +2813,8 @@ msgstr ""
 #: ../urpmi.recover:38
 #, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - wyświetla listę wszystkich zdarzeń w rpmdb (długie)\n"
+msgstr ""
+"  --list-all     - wyświetla listę wszystkich zdarzeń w rpmdb (długie)\n"
 
 #: ../urpmi.recover:39
 #, c-format
@@ -2973,12 +3014,13 @@ msgstr "  -ff             - wymusza aktualizację plików syntezy.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Tylko administrator ma prawo aktualizować nośniki"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
+msgstr ""
+"brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2987,17 +3029,17 @@ msgstr ""
 "brak wpisu do aktualizacji\n"
 "(jeden z %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorowanie nośnika %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "włączanie nośnika \"%s\""
@@ -3067,17 +3109,21 @@ msgstr "  --list-aliases    - wypisuje dostępne równoległe aliasy.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - zrzuca konfigurację w postaci urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - zrzuca konfigurację w postaci urpmi.addmedia argument.\n"
 
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - następny pakiet jest pakietem źródłowym (tak jak -s).\n"
+msgstr ""
+"  --src          - następny pakiet jest pakietem źródłowym (tak jak -s).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - wypisuje wszystkie pakiety źródłowe przed pobraniem\n"
 "                   (tylko root).\n"
@@ -3184,7 +3230,8 @@ msgstr "  -g             - wyświetla grupy wraz z ich nazwami.\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - wyświetla użyteczne informacje w czytelnej formie.\n"
+msgstr ""
+"  -i             - wyświetla użyteczne informacje w czytelnej formie.\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3204,19 +3251,22 @@ msgstr "  -r             - wyświetla wersję i wydanie wraz z nazwą.\n"
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - następny pakiet jest pakietem źródłowym (tak jak --src).\n"
+msgstr ""
+"  -s             - następny pakiet jest pakietem źródłowym (tak jak --src).\n"
 
 #: ../urpmq:106
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
-msgstr "  -u             - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
+msgstr ""
+"  -u             - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
 
 #: ../urpmq:107
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
+msgstr ""
+"  -y             - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
 
 #: ../urpmq:108
 #, c-format
@@ -3261,14 +3311,16 @@ msgstr ""
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "brak  informacji xml  dla nośnika %s, uzyskanie wyników dla pakietu %s było "
 "niemożliwe"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "brak  informacji xml dla nośnika %s, uzyskanie wyników dla pakietów %s było "
 "niemożliwe"
@@ -3278,3 +3330,5 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nie znaleziono dziennika zmian\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Aktualizowanie nośnika...\n"
diff --git a/po/pt.po b/po/pt.po
index b1e0458f..8201376f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-09-06 11:53+0100\n"
 "Last-Translator: Zé <ze@mandriva.org>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -35,22 +35,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Instalação RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erro: não é possível encontrar o ficheiro %s, irá cancelar a operação"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "O que deseja fazer?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -87,7 +87,7 @@ msgstr ""
 "\n"
 "Deseja proseguir?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -102,22 +102,22 @@ msgstr ""
 "\n"
 "Pode preferir apenas gravar. Qual é a sua escolha?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instalar"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Gravar"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Escolha a localização para gravar o ficheiro"
@@ -230,12 +230,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Nenhum pacote indicado"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Por favor aguarde..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Deve ser root"
@@ -266,42 +266,42 @@ msgstr ""
 "%s\n"
 "Continuar a instalação?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (para actualizar)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (para instalar)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Escolha de pacotes"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "É necessário um dos seguintes pacotes:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -313,57 +313,64 @@ msgstr ""
 "%s\n"
 "Continuar a instalação?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Para satisfazer as dependências, o seguinte pacote irá ser instalado:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Para satisfazer as dependências, os seguintes pacotes irão ser instalados:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pacote, %d MB)"
 msgstr[1] "(%d pacotes, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "não é possível obter os pacotes fonte, abortar"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "A preparar..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "A instalar o pacote `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Por favor insira a média chamada \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "A transferir o pacote `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...transferência falhada: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Terminado"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -374,28 +381,27 @@ msgstr ""
 "%s\n"
 "Talvez precise actualizar a sua base de dados urpmi."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalação falhada:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Os pacote(s) já estão instalados"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalação finalizada"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "a remover %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "a reiniciar urpmi"
@@ -469,58 +475,52 @@ msgstr "O directório de ambiente %s não existe"
 msgid "using specific environment on %s\n"
 msgstr "a usar um ambiente específico em %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "não é possível abrir rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nome do ficheiro rpm inválido [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "a transferir o ficheiro rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...transferência terminada"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...transferência falhada: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "não é possível aceder ao ficheiro rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "não é possível analisar o ficheiro spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "não é possível registar o ficheiro rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Arquitectura incompatível para o rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "erro ao registar os pacotes locais"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Esta operação é proibida enquanto correr em modo restrito"
@@ -562,22 +562,22 @@ msgstr ""
 "por predefinição o urpmf espera uma expressão regular. Deve usar a opção \"--"
 "literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "o directório chroot não existe"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Não pode usar %s sem %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Não pode usar %s com %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
@@ -672,82 +672,87 @@ msgstr "%s falhado: saiu com o sinal %d"
 msgid "%s failed: exited with %d"
 msgstr "%s falhado: saiu com %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "cópia falhada"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget em falta\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl em falta\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl falhado: transferência cancelada\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync em falta\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh em falta\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla em falta\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Não foi possível executar o prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 em falta\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% de %s completo, ETA = %s, velocidade = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% completo, velocidade = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "a obter %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "obtido %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocolo desconhecido definido para %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nenhum webfetch encontrado, os webfetch suportados são: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "não é possível usar o protocolo: %s"
@@ -767,59 +772,59 @@ msgstr "o pacote %s não foi encontrado."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "a transferir os ficheiros rpm a partir da média \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[reempacotamento]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "não é possível criar a transacção"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "não é possível extrair o rpm do pacote delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "não é possível instalar o pacote %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "a remover rpm danificado (%s) de %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "remoção %s falhada: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "A remover pacote %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "a remover o pacote %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "a remover rpms instalados (%s) de %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Mais informações no pacote %s"
@@ -864,18 +869,23 @@ msgstr "a abortar."
 msgid "%s database is locked (another program is already using it)"
 msgstr "base de dados %s trancada (já está a ser usada por outra aplicação)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalação falhada"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Continuar a tentar na mesma? (s/N) "
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -884,57 +894,57 @@ msgstr ""
 "Instalação falhada, rpm danificado:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "O seguinte pacote tem uma assinatura inválida"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Os seguintes pacotes têm assinaturas inválidas"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Deseja continuar a instalação?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "a remover rpms instalados (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "a distribuir %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "a instalar %s de %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "a instalar %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Tentar instalação sem verificar dependências? (s/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Tentar forçar a instalação (--force)? (s/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Os pacotes estão actualizados"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "A instalação é possível"
@@ -1140,7 +1150,7 @@ msgstr "cópia de [%s] falhada (o ficheiro é suspeitosamente pequeno)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "a calcular o md5sum da fonte synthesis transferida"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "obtenção de [%s] falhada (md5sum diferente)"
@@ -1180,33 +1190,33 @@ msgstr "nenhum ficheiro synthesis encontrado para a média \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "a transferir a fonte synthesis de \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "a examinar o ficheiro de chaves públicas de \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...chave %s importada do ficheiro de chaves públicas de \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 "não é possível importar o ficheiro de chaves públicas (pubkey) de \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nenhum ficheiro synthesis encontrado para a média \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "média actualizada \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "obtenção de [%s] falhada"
@@ -1221,94 +1231,99 @@ msgstr "a tentar novamente o espelho %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Não foi possível encontrar um espelho da lista de espelhos %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "encontrada a geolocalização%s %.2f %.2f do fuso horário %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "a obter lista de espelhos de %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Desculpe, escolha inválida, tente novamente\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pacote"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versão"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Lançamento"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arquitectura"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(sugerido)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "média \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "linha de comandos"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1397,308 +1412,6 @@ msgstr "a montar %s"
 msgid "unmounting %s"
 msgstr "a desmontar %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf versão %s\n"
-"Direitos de autor (C) 2002-2006 Mandriva.\n"
-"Isto é um programa livre e pode ser redistribuído sob o termos da GPL GNU.\n"
-"\n"
-"uso:urpmf [opções] expressão-padrão\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - mostra o número da versão desta ferramenta.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - usa um ambiente especifico (geralmente um relatório de "
-"erro).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - não usa a média indicada, separada por vírgula.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - não combina médias padrões, usa o argumento como uma "
-"string literal.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - usa outra raiz para base de dados urpmi e instalação "
-"rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - organiza as médias de acordo com as substrings separadas "
-"por vírgula.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - usa a localização dada para aceder à média\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - usa o ficheiro synthesis dado em vez da base de dados "
-"urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - não mostra linhas idênticas.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - usa apenas a média de actualização.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose      - modo detalhado.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i            - ignora as diferenças de capitalização em todos os "
-"padrões.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - honra as diferenças de capitalização em todos os padrões "
-"(predefinição).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - muda o campo separador (predefinido para ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Expressões padrão:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - qualquer texto é analisado como uma expressão regular, a "
-"não ser que -l seja usado .\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e            - inclui o código perl directamente como perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operador binário AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operador binário OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - operador unário NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - parêntesis esquerdo e direito.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Lista de marcas:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - indica um formato de saída tipo o printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   exemplo: '%%nome:%%ficheiros'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arquitectura\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - endereço de compilação\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - data de compilação\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - ficheiros de configuração\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - marcas de conflitos\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - descrição do pacote\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribuição\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - época\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - nome do ficheiro do pacote\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - lista dos ficheiros existentes no pacote\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grupo\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licença\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - nome do pacote\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - marcas de obsoletos\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - empacotador\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - marcas de fornecidos\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - marcas de requeridos.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - tamanho instalado\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nome do rpm de código fonte\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - sugere marcas\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - sumário\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - vendedor\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - a média onde o pacote foi encontrado\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - mostra a versão, a saída e a arquitectura com o nome.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Formato incorrecto: pode apenas usar uma marca multi-avaliada"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nenhum ficheiro hdlist disponível para a média \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "nenhum ficheiro synthesis disponível para a média \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "nenhuma informação xml disponível para a média \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1718,7 +1431,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nenhum pacote chamado %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Os seguintes pacotes contêm %s: %s"
@@ -1728,47 +1441,47 @@ msgstr "Os seguintes pacotes contêm %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Deve usar \"-a\" para escolher todos"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "encontrados %s pacotes na bd urpmi, mas nenhum se encontra instalado"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "O pacote %s já se encontra instalado"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Os pacote %s já se encontram instalados"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "devido a faltar %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "devido a já se encontrar instalado %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "devido a não satisfazer %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "a tentar promover %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "para guardar %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1777,7 +1490,7 @@ msgstr ""
 "O seguinte pacote tem que ser removido para que outros sejam actualizados:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1787,12 +1500,12 @@ msgstr ""
 "actualizados:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "para instalar %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "devido a conflitos com %s"
@@ -1886,6 +1599,14 @@ msgstr "  --repackage    - Reempacota os ficheiros antes de os apagar\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usa outra raiz para remover os rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - usa outra raiz para base de dados urpmi e instalação "
+"rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1919,39 +1640,39 @@ msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selecciona todos os pacotes correspondentes à expressão.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Apenas o superutilizador tem permissão para remover os pacotes"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pacotes desconhecidos"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pacote desconhecido"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "A remoção do seguinte pacote irá danificar o seu sistema:"
 msgstr[1] "A remoção dos seguintes pacotes irá danificar o seu sistema:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nada a remover"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Nenhuns orfãos a remover"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1960,45 +1681,333 @@ msgstr[0] "Para satisfazer as dependências, o seguinte pacote será removido"
 msgstr[1] ""
 "Para satisfazer as dependências, os seguintes %d pacotes serão removidos"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(pacote orfão)"
 msgstr[1] "(pacotes orfãos)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Remover %d pacote?"
 msgstr[1] "Remover %d pacotes?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "a testar remoção de %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Remoção falhada"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "A remoção é possível"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf versão %s\n"
+"Direitos de autor (C) 2002-2006 Mandriva.\n"
+"Isto é um programa livre e pode ser redistribuído sob o termos da GPL GNU.\n"
+"\n"
+"uso:urpmf [opções] expressão-padrão\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - mostra o número da versão desta ferramenta.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - usa um ambiente especifico (geralmente um relatório de "
+"erro).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - não usa a média indicada, separada por vírgula.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - não combina médias padrões, usa o argumento como uma "
+"string literal.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - organiza as médias de acordo com as substrings separadas "
+"por vírgula.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - usa a localização dada para aceder à média\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - usa o ficheiro synthesis dado em vez da base de dados "
+"urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - não mostra linhas idênticas.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - usa apenas a média de actualização.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose      - modo detalhado.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i            - ignora as diferenças de capitalização em todos os "
+"padrões.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - honra as diferenças de capitalização em todos os padrões "
+"(predefinição).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - muda o campo separador (predefinido para ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Expressões padrão:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - qualquer texto é analisado como uma expressão regular, a "
+"não ser que -l seja usado .\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e            - inclui o código perl directamente como perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operador binário AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operador binário OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - operador unário NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - parêntesis esquerdo e direito.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Lista de marcas:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - indica um formato de saída tipo o printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   exemplo: '%%nome:%%ficheiros'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arquitectura\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - endereço de compilação\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - data de compilação\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - ficheiros de configuração\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - marcas de conflitos\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - descrição do pacote\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribuição\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - época\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - nome do ficheiro do pacote\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - lista dos ficheiros existentes no pacote\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grupo\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licença\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - nome do pacote\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - marcas de obsoletos\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - empacotador\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - marcas de fornecidos\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - marcas de requeridos.\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - tamanho instalado\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nome do rpm de código fonte\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - sugere marcas\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - sumário\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - vendedor\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - a média onde o pacote foi encontrado\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - mostra a versão, a saída e a arquitectura com o nome.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "expressão não terminada (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Formato incorrecto: pode apenas usar uma marca multi-avaliada"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nenhum ficheiro hdlist disponível para a média \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "nenhum ficheiro synthesis disponível para a média \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "nenhuma informação xml disponível para a média \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2360,36 +2369,31 @@ msgstr ""
 "Erro: %s parece estar montado apenas como leitura.\n"
 "Use --allow-force para forçar a operação."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "A actualizar média...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (para actualizar)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (para actualizar)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (para instalar)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (para instalar)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2397,12 +2401,12 @@ msgid ""
 msgstr ""
 "Para satisfazer as '%s' dependências, é necessário um dos seguintes pacotes:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Qual é a sua escolha? (1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2413,7 +2417,7 @@ msgstr ""
 "que são mais antigos do que os que estão instalados:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2424,7 +2428,7 @@ msgstr ""
 "pacotes que são mais antigos do que os instalados:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2433,12 +2437,12 @@ msgstr ""
 "\n"
 "Continuar a instalação na mesma?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2447,7 +2451,7 @@ msgstr ""
 "Um pacote pedido não pode ser instalado:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2456,12 +2460,12 @@ msgstr ""
 "Alguns pacotes pedidos não podem ser instalados:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "a remoção do pacote %s irá danificar o seu sistema"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2472,7 +2476,7 @@ msgstr ""
 "que ser removido para que outros sejam actualizados:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2483,12 +2487,12 @@ msgstr ""
 "que ser removidos para que outros sejam actualizados:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(testa apenas, a remoção não é executada)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2499,46 +2503,46 @@ msgstr ""
 "seguintes dependências:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "O seguinte pacote orfão será removido."
 msgstr[1] "Os seguintes pacotes orfãos serão removidos."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(testa apenas, a instalação não é executada)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s adicionais do espaço do disco irão ser usados."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s do espaço do disco irão ser libertados"
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s dos pacotes serão transferidos."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Prosseguir com a instalação do pacote?"
 msgstr[1] "Prosseguir com a instalação dos %d pacotes?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Prima Enter quando estiver montado..."
@@ -3005,12 +3009,12 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Apenas o superutilizador pode actualizar as médias"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada a actualizar (use urpmi.addmedia para adicionar uma média)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3019,17 +3023,17 @@ msgstr ""
 "a entrada a actualizar está em falta\n"
 "(um de %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "a ignorar a média %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "a activar a média %s"
@@ -3319,6 +3323,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nenhum registo de mudanças (changelog) encontrado\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "A actualizar média...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "a examinar ficheiro %s"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 432d2fb5..1fde66a3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-08 10:52-0300\n"
 "Last-Translator: Felipe Arruda <felipemiguel@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -33,22 +33,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Instalação de RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erro: não foi possível encontrar arquivo %s, cancelando operação"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "O que você deseja fazer?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -86,7 +86,7 @@ msgstr ""
 "\n"
 "Confirma instalação?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -102,22 +102,22 @@ msgstr ""
 "\n"
 "Você pode apenas salvá-lo(s). Qual a sua escolha?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instalar"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Escolha o local para salvar o arquivo"
@@ -161,14 +161,16 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automaticamente seleciona os pacotes necessários para \n"
 "                   atualizar o sistema.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - força mesmo se alguns pacotes não existem.\n"
 
 #: ../gurpmi.pm:50 ../urpmi:133
@@ -183,17 +185,20 @@ msgstr ""
 #: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - use somente as mídias listadas (separadas por vírgula).\n"
+msgstr ""
+"  --media        - use somente as mídias listadas (separadas por vírgula).\n"
 
 #: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - permite a busca em 'provides' para achar o pacote.\n"
+msgstr ""
+"  -p             - permite a busca em 'provides' para achar o pacote.\n"
 
 #: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - não procure em 'provides' para encontrar o pacote.\n"
+msgstr ""
+"  -P             - não procure em 'provides' para encontrar o pacote.\n"
 
 #: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
@@ -211,7 +216,8 @@ msgstr ""
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  - usa apenas a mídia fornecida para buscar pacotes.\n"
 
 #: ../gurpmi.pm:100
@@ -219,12 +225,12 @@ msgstr "  --searchmedia  - usa apenas a mídia fornecida para buscar pacotes.\n"
 msgid "No packages specified"
 msgstr "Nenhum pacote especificado"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Por favor aguarde..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "É necesssário super usuário"
@@ -255,42 +261,42 @@ msgstr ""
 "%s\n"
 "Prosseguir com a instalação mesmo assim?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (para atualizar)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (para instalar)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Escolha de programas"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Um dos programas a seguir é necessário:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -301,54 +307,64 @@ msgstr ""
 "%s\n"
 "Prosseguir com a instalação mesmo assim?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Para satisfazer as dependências, o seguinte pacote será instalado:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Para satisfazer as dependências, os seguintes programas serão instalados:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Para satisfazer as dependências, os seguintes programas serão instalados:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pacote, %d MB)"
 msgstr[1] "(%d pacotes, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "incapaz de obter pacotes fonte, abortando"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando pacote `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Por favor insira a mídia chamada \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Baixando o pacote `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...a busca falhou: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Pronto"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -359,28 +375,27 @@ msgstr ""
 "%s\n"
 "Você deve atualizar a sua base de dados urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "A Instalação falhou:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Tudo já está instalado"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalação concluída"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "removendo %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
@@ -454,58 +469,52 @@ msgstr "Diretório de ambiente %s não existe"
 msgid "using specific environment on %s\n"
 msgstr "usando o ambiente específico em %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "incapaz de abrir rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nome rpm inválido [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "buscando o arquivo rpm [%s]...."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...busca completa"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...a busca falhou: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "incapaz de acessar o arquivo rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "incapaz de processar arquivo spec %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "incapaz de registrar arquivo rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Arquitetura incompatível para o rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "erro ao registrar pacotes locais"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Esta operação não é permitida no modo restrito"
@@ -543,24 +552,25 @@ msgstr "sem expressão para fechar"
 #: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "por padrão urpmf espera uma regexp. você pode usar a opção \"--literal\""
+msgstr ""
+"por padrão urpmf espera uma regexp. você pode usar a opção \"--literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "diretório chroot não existe"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Não é possível usar %s sem %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Não é possível usar %s com %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Muitos parâmetros\n"
@@ -656,82 +666,87 @@ msgstr "%s falhou: saiu com sinal %d"
 msgid "%s failed: exited with %d"
 msgstr "%s falhou: saiu com %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "falha na cópia"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget não encontrado\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl não encontrado\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl falhou: download cancelado\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync não encontrado\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh não encontrado\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozila não encontrado\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Não foi possível executar o prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 não encontrado\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% de %s completados, ETA = %s, velocidade = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% completados, velocidade = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "buscando %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "recebido %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocolo desconhecido definido para %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nenhuma webfetch encontrada, webfetch suportadas são: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "incapaz de usar protocolo: %s"
@@ -751,57 +766,59 @@ msgstr "o pacote %s não foi encontrado."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "buscando os arquivos rpm da mídia \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[reempacotamento]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transação criada para instalar %s (remover=%d, instalar=%d, atualizar=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transação criada para instalar %s (remover=%d, instalar=%d, atualizar=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "incapaz de criar a transação"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "incapaz de extrair rpm do pacote delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "incapaz de instalar o pacote %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "removendo rpm ruim (%s) de %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "removendo %s com falha: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Removendo pacote %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "removendo pacote %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "removendo rpms instalados (%s) de %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Mais informações no pacote %s"
@@ -846,18 +863,23 @@ msgstr "cancelando"
 msgid "%s database is locked (another program is already using it)"
 msgstr "base de dados %s está bloqueada (sendo usada por outro programa)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "A Instalação falhou"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Continuar mesmo assim? (S/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -866,57 +888,57 @@ msgstr ""
 "A instalação falhou, rpms ruins:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "O seguinte pacote contém assinaturas erradas"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Os seguintes programas contêm assinaturas erradas"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Você deseja continuar a instalação?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "removendo rpms instalados (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuindo %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalando %s a partir de %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instalando %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Tentar instalar sem checar as dependências? (s/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Forçar instalação (--force)? (s/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pacotes estão atualizados"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalação é possível"
@@ -1028,7 +1050,8 @@ msgstr "incapaz de analisar media.cfg"
 #: ../urpm/media.pm:831
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "incapaz de acessar as mídias da distribuição (media.cfg não encontrado)"
+msgstr ""
+"incapaz de acessar as mídias da distribuição (media.cfg não encontrado)"
 
 #: ../urpm/media.pm:849
 #, c-format
@@ -1120,7 +1143,7 @@ msgstr "cópia de [%s] falhou (arquivo é suspeitamente pequeno)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "computando o md5sum de uma fonte synthesis"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "baixa de [%s] falhou (md5sum não é igual)"
@@ -1160,32 +1183,32 @@ msgstr "metadados não encontrados para a mídia \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "obtendo a fonte synthesis de \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinando arquivo de chave pública em \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importando chave %s do arquivo de chaves públicas de \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "incapaz de importar arquivo de chave pública de \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nenhum arquivo synthesis encontrado para a mídia \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "atualizada a mídia \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "busca de [%s] falhou"
@@ -1200,94 +1223,99 @@ msgstr "tentando novamente com o espelho %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Não foi possível encontar um espelho da lista %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "encontrada geolocalização %s %.2f %.2f do fuso horário %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "obtendo a lista de espelhos de %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Desculpe, má escolha, tente novamente\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pacote"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versão"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Release"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arch"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(sugerido)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "mídia \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "linha de comando"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1295,7 +1323,8 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "O seguinte pacote está órfão. Use \"urpme --auto-orphans\" para removê-lo."
+msgstr[0] ""
+"O seguinte pacote está órfão. Use \"urpme --auto-orphans\" para removê-lo."
 msgstr[1] ""
 
 #: ../urpm/parallel.pm:14
@@ -1372,300 +1401,6 @@ msgstr "montando %s"
 msgid "unmounting %s"
 msgstr "desmontando %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf versão %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
-"GPL.\n"
-"\n"
-"uso: urpmf [opções] expressão\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - imprime o número da versão desta ferramenta.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - usa um ambiente específico (tipicamente para relatório\n"
-"                   de falhas).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - não usa as mídias fornecidas (separadas por vírgula).\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - não combina com padrão, utilize argumento como uma\n"
-"                   string de literais.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root    - use outro root para o urpmi e instalação rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - ordena as mídias (separadas por vírgulas).\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - usa o caminho dado para acessar mídias\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - usa synthesis fornecido ao invés do banco de dados "
-"urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - não lista linhas idênticas.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - use somente mídias de atualização.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modo detalhado.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignora a distinção de maiúscula/minúscula em tudo.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - Considera diferença entre maiúsculas/minúsculas.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - altera o separador de campo (padrão é ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Expressões Regulares:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - qualquer texto é tratado como uma expressão regular, a\n"
-"                   menos que -l seja usado.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inclui o código perl diretamente como em 'perl -e'.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operador binário 'E'.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operador binário 'OU'.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - operador unário 'NÃO'.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - parênteses direito e esquerdo.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Lista de tags:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - especifica um formato de impressão para a saída\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   exemplo: '%%nome:%%arquivos'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arquitetura\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - máquina onde foi compilado\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - data que foi compilado\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - arquivos de configuração\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - lista conflitos\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - descrição do pacote\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribuição\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epoch\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - nome do pacote\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - lista de arquivos contidos no pacote\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grupo\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licença\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - nome do pacote\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - lista todos arquivos obsoletos\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - empacotador\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - lista dos que provem o pacote\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - lista dos que requerem o pacote\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - tamanho da instalação.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nome da fonte do rpm\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - lista sugestões\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - sumário\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - fabricante\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - a mídia onde o pacote foi encontrado\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - imprime versão, 'release' e arquitetura, com nome.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Formato incorreto: você deve utilizar somente uma opção com múltiplos valores"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nenhum hdlist disponível para a mídia \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "synthesis não disponível para a mídia \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "xml-info não disponível para a mídia \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1673,15 +1408,17 @@ msgstr "o urpmi foi reiniciado, e a lista de pacotes prioritários não mudou"
 
 #: ../urpm/select.pm:32
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "o urpmi foi reiniciado, e a lista de pacotes prioritários mudou: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"o urpmi foi reiniciado, e a lista de pacotes prioritários mudou: %s vs %s"
 
 #: ../urpm/select.pm:170
 #, c-format
 msgid "No package named %s"
 msgstr "Nenhum nome de pacote %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Os seguintes pacotes contém %s: %s"
@@ -1691,47 +1428,48 @@ msgstr "Os seguintes pacotes contém %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Você deve usar a opção \"-a\" para usar que o urpmi use todas"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "encontrado(s) o(s) pacote(s) %s no urpmi db, mas nenhum deles está instalado"
+msgstr ""
+"encontrado(s) o(s) pacote(s) %s no urpmi db, mas nenhum deles está instalado"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pacote %s já está instalado"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pacotes %s já estão instalados"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "devido estar faltando %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "devido ao pacote já instalado %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "devido a estar faltando %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "tentando promover %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "para manter %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1740,21 +1478,22 @@ msgstr ""
 "Este pacote precisa ser removido para que os outros sejam atualizados:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
-"Estes programas precisam ser removidos para que os outros sejam atualizados:\n"
+"Estes programas precisam ser removidos para que os outros sejam "
+"atualizados:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "para instalar %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "devido a conflitos com %s"
@@ -1829,7 +1568,8 @@ msgstr "  --auto-orphans - remove dependências e programas órfãos\n"
 #: ../urpme:49
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verifica se a remoção pode ser feita corretamente.\n"
+msgstr ""
+"  --test         - verifica se a remoção pode ser feita corretamente.\n"
 
 #: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
@@ -1846,10 +1586,17 @@ msgstr "  --repackage    - reempacota os arquivos antes da remoção\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - use outro root para desisntalação de rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root    - use outro root para o urpmi e instalação rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - atualiza somente a base rpm, não o sistema de arquivos.\n"
+msgstr ""
+"  --justdb       - atualiza somente a base rpm, não o sistema de arquivos.\n"
 
 #: ../urpme:56
 #, c-format
@@ -1874,86 +1621,378 @@ msgstr "  --verbose, -v  - modo detalhado.\n"
 #: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - seleciona todos os pacotes que combinam com a expressão.\n"
+msgstr ""
+"  -a             - seleciona todos os pacotes que combinam com a expressão.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Apenas super usuário tem permissão para remover programas"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pacotes desconhecidos"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pacote desconhecido."
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "A remoção do pacote irá danificar o seu sistema:"
 msgstr[1] "A remoção dos seguintes programas irá danificar o seu sistema:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nada para remover"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Nenhum pacote órfão para ser removido"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "Para satisfazer as dependências, o seguinte pacote será removido"
-msgstr[1] "Para satisfazer as dependências, os %d pacotes seguintes serão removidos"
+msgstr[1] ""
+"Para satisfazer as dependências, os %d pacotes seguintes serão removidos"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(pacote órfão)"
 msgstr[1] "(pacotes órfãos)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Remover %d pacote?"
 msgstr[1] "Remover %d pacotes?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "testando a remoção de %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "A remoção falhou"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "A remoção é possível"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf versão %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
+"GPL.\n"
+"\n"
+"uso: urpmf [opções] expressão\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - imprime o número da versão desta ferramenta.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - usa um ambiente específico (tipicamente para relatório\n"
+"                   de falhas).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - não usa as mídias fornecidas (separadas por vírgula).\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - não combina com padrão, utilize argumento como uma\n"
+"                   string de literais.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - ordena as mídias (separadas por vírgulas).\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - usa o caminho dado para acessar mídias\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - usa synthesis fornecido ao invés do banco de dados "
+"urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - não lista linhas idênticas.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - use somente mídias de atualização.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modo detalhado.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignora a distinção de maiúscula/minúscula em tudo.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - Considera diferença entre maiúsculas/minúsculas.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - altera o separador de campo (padrão é ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Expressões Regulares:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - qualquer texto é tratado como uma expressão regular, a\n"
+"                   menos que -l seja usado.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+"  -e             - inclui o código perl diretamente como em 'perl -e'.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operador binário 'E'.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operador binário 'OU'.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - operador unário 'NÃO'.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - parênteses direito e esquerdo.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Lista de tags:\n"
+"\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - especifica um formato de impressão para a saída\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   exemplo: '%%nome:%%arquivos'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arquitetura\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - máquina onde foi compilado\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - data que foi compilado\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - arquivos de configuração\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - lista conflitos\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - descrição do pacote\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribuição\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epoch\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - nome do pacote\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - lista de arquivos contidos no pacote\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grupo\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licença\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - nome do pacote\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - lista todos arquivos obsoletos\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - empacotador\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - lista dos que provem o pacote\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - lista dos que requerem o pacote\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - tamanho da instalação.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nome da fonte do rpm\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - lista sugestões\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - sumário\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - fabricante\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - a mídia onde o pacote foi encontrado\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - imprime versão, 'release' e arquitetura, com nome.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "expressão indeterminada (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Formato incorreto: você deve utilizar somente uma opção com múltiplos valores"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nenhum hdlist disponível para a mídia \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "synthesis não disponível para a mídia \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "xml-info não disponível para a mídia \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2031,7 +2070,8 @@ msgstr "  --buildrequires - instala buildrequires dos pacotes\n"
 #: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instala somente o pacote de fontes (sem binários).\n"
+msgstr ""
+"  --install-src  - instala somente o pacote de fontes (sem binários).\n"
 
 #: ../urpmi:99
 #, c-format
@@ -2045,7 +2085,8 @@ msgstr "  --noclean      - não remove os rpms do cache.\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - força a reinstalação de pacotes já instalados.\n"
 
 #: ../urpmi:104
@@ -2175,12 +2216,14 @@ msgstr "  --excludedocs  - exclui arquivos de documentação.\n"
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - não verifica o espaço em disco antes da instalação.\n"
+msgstr ""
+"  --ignoresize   - não verifica o espaço em disco antes da instalação.\n"
 
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - permite instalar rpms de arquiteturas divergentes.\n"
+msgstr ""
+"  --ignorearch   - permite instalar rpms de arquiteturas divergentes.\n"
 
 #: ../urpmi:140
 #, c-format
@@ -2273,7 +2316,8 @@ msgstr "padrão para --buildrequires"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "favor usar --buildrequires ou --install-src, preferencialmente --"
 "buildrequires"
@@ -2301,48 +2345,44 @@ msgstr ""
 "Erro: %s parece estar montado apenas como leitura.\n"
 "Usar --allow-force para forçar a operação."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Atualizando mídias...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (para atualizar)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (para atualizar)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (para instalar)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (para instalar)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
-msgstr "Para satisfazer a dependência '%s', um dos seguintes pacotes é necessário:"
+msgstr ""
+"Para satisfazer a dependência '%s', um dos seguintes pacotes é necessário:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Qual é a sua escolha? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2353,7 +2393,7 @@ msgstr ""
 "que são mais antigos que os atualmente instalados:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2364,7 +2404,7 @@ msgstr ""
 "que são mais antigos que os atualmente instalados:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2373,12 +2413,12 @@ msgstr ""
 "\n"
 "Prosseguir instalação mesmo assim?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2387,7 +2427,7 @@ msgstr ""
 "Um pacote não pôde ser instalado:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2396,12 +2436,12 @@ msgstr ""
 "Alguns pacotes não puderam ser instalados:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "a remoção do pacote %s irá danificar seu sistema"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2412,7 +2452,7 @@ msgstr ""
 "precisa ser removido para que os outros possam ser atualizados:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2423,12 +2463,12 @@ msgstr ""
 "precisam ser removidos para que os outros possam ser atualizados:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(somente teste, remoções não serão efetivadas)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2439,46 +2479,46 @@ msgstr ""
 "dependências:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "O seguinte pacote órfão será removido"
 msgstr[1] "Os seguintes pacotes órfãos serão removidos"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(somente teste, instalações não serão efetivadas)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s de espaço adicional em disco serão usados."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s de espaço em disco serão liberados."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s de pacotes serão baixados."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Proceder a instalação de um pacote?"
 msgstr[1] "Proceder a instalação de %d pacotes?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tecle Enter quando estiver pronto..."
@@ -2615,7 +2655,8 @@ msgstr ""
 #: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
-msgstr "  --virtual      - cria mídias virtuais que estão sempre atualizadas.\n"
+msgstr ""
+"  --virtual      - cria mídias virtuais que estão sempre atualizadas.\n"
 
 #: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
@@ -2730,7 +2771,8 @@ msgstr "  --noclean      - não remove rpms reempacotados no checkpoint.\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr "  --list         - lista transações desde data/duração fornecida\n"
 
 #: ../urpmi.recover:38
@@ -2909,7 +2951,8 @@ msgstr "  --no-ignore    - não atualizar, marcar a mídia como habilitada.\n"
 #: ../urpmi.update:49
 #, c-format
 msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
-msgstr "  --probe-rpms   - não usar synthesis, usando arquivos rpm diretamente\n"
+msgstr ""
+"  --probe-rpms   - não usar synthesis, usando arquivos rpm diretamente\n"
 
 #: ../urpmi.update:50
 #, c-format
@@ -2931,12 +2974,12 @@ msgstr "  -ff            - realmente força a atualização de synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Apenas o super usuário tem permissão para atualizar mídia"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada a atualizar (use urpmi.addmedia para adicionar uma mídia)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2945,17 +2988,17 @@ msgstr ""
 "a entrada a ser atualizada está faltando\n"
 "(uma de %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorando mídia \"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "habilitando mídia \"%s\""
@@ -3014,7 +3057,8 @@ msgstr "  --list-url     - lista mídias disponíveis e suas url's.\n"
 #: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - lista os nós disponíveis quando  --parallel é usada.\n"
+msgstr ""
+"  --list-nodes   - lista os nós disponíveis quando  --parallel é usada.\n"
 
 #: ../urpmq:62
 #, c-format
@@ -3023,7 +3067,8 @@ msgstr "  --list-aliases - lista os apelidos paralelos disponíveis\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - mostrar a configuração como argumentos para o\n"
 "                   urpmi.addmedia.\n"
@@ -3031,11 +3076,13 @@ msgstr ""
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
+msgstr ""
+"  --src          - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - fornece todos os pacotes fonte antes de baixar\n"
 "                   (somente root).\n"
@@ -3043,7 +3090,8 @@ msgstr ""
 #: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - permite consultar pacotes de arquiteturas divergentes.\n"
+msgstr ""
+"  --ignorearch   - permite consultar pacotes de arquiteturas divergentes.\n"
 
 #: ../urpmq:71
 #, c-format
@@ -3140,7 +3188,8 @@ msgstr "  -g             - imprime grupos, com nome também.\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - imprime informações úteis em formato que pode ser lido\n"
+msgstr ""
+"  -i             - imprime informações úteis em formato que pode ser lido\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3160,7 +3209,8 @@ msgstr "  -r             - imprime versão e 'release' com nome também.\n"
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
+msgstr ""
+"  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
 
 #: ../urpmq:106
 #, c-format
@@ -3179,7 +3229,8 @@ msgstr "  -y             - impõe uma busca aproximada (igual a --fuzzy).\n"
 #: ../urpmq:108
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             - como -y, ignorando a distinção de maiúscula/minúscula.\n"
+msgstr ""
+"  -Y             - como -y, ignorando a distinção de maiúscula/minúscula.\n"
 
 #: ../urpmq:109
 #, c-format
@@ -3213,14 +3264,16 @@ msgstr "sem xml info para a mídia \"%s\", resultado parcial para os pacotes %s"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "sem xml info para a mídia \"%s\", incapaz de retornar resultados para o "
 "pacote %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "sem xml info para a mídia \"%s\", incapaz de retornar resultados para os "
 "pacotes %s"
@@ -3230,6 +3283,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Arquivo com as alterações não foi encontrado \n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Atualizando mídias...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "examinando arquivo %s"
 
@@ -3635,4 +3691,4 @@ msgstr "Arquivo com as alterações não foi encontrado \n"
 #~ "  --norebuild    - não tenta recriar o hdlist se ele não puder ser lido.\n"
 
 #~ msgid "The following package names were assumed: %s"
-#~ msgstr "Os seguintes nomes de pacotes serão assumidos: %s"
-\ No newline at end of file
+#~ msgstr "Os seguintes nomes de pacotes serão assumidos: %s"
diff --git a/po/ro.po b/po/ro.po
index 8ee5ea98..4478df15 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-10-17 13:28+0100\n"
 "Last-Translator: Florin Catalin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Mandrivausers.ro <cfrussenàyahoo.co.uk>\n"
@@ -47,22 +47,22 @@ msgstr ""
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Instalare RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Eroare: nu s-a găsit fişierul %s, se anulează operaţiunea"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -83,7 +83,7 @@ msgstr ""
 "\n"
 "Ce doriţi să faceţi?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -99,7 +99,7 @@ msgstr ""
 "\n"
 "Continuaţi?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -115,22 +115,22 @@ msgstr ""
 "\n"
 "În schimb, îl puteţi salva doar. Ce alegeţi?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instalare"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Salvare"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Renunţă"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Alegeţi locul unde se salvează fişierul"
@@ -241,12 +241,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Nu a fost specificat nici un pachet"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Vă rog să aşteptaţi..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Trebuie să fiţi administrator"
@@ -277,42 +277,42 @@ msgstr ""
 "%s\n"
 "Continuaţi instalarea?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Avertisment"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (pentru actualizare)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (pentru instalare)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Alegerea pachetului"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unul din următoarele pachete e necesar:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Abandonaţi"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -323,20 +323,20 @@ msgstr ""
 "%s\n"
 "Continuaţi instalarea?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Pentru satisfacerea dependenţelor, următorul pachet va fi instalat:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Pentru satisfacerea dependenţelor, următoarele pachete vor fi instalate:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -344,37 +344,44 @@ msgstr[0] "(%d pachet, %d MB)"
 msgstr[1] "(%d pachete, %d MB)"
 msgstr[2] "(%d pachete, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nu se pot prelua pachetele sursă, se întrerupe"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Pregătire..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Se instalează pachetului `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Introduceţi mediul numit \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Se descarcă pachetul `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...copierea eşuată: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Gata"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -385,28 +392,27 @@ msgstr ""
 "%s\n"
 "Probabil ar trebui să actualizaţi baza de date urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalarea a eşuat:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "totul este deja instalat"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalare terminată"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "elimin %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "repornesc urpmi"
@@ -480,58 +486,52 @@ msgstr "Directorul %s din sistem nu există"
 msgid "using specific environment on %s\n"
 msgstr "folosind mediul specific pe %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "nu pot deschide rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nume de fişier rpm nevalid [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "primire fişier rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...copierea este terminată"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...copierea eşuată: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nu pot accesa fişierul rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "nu se poate parcurge fişierul %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "nu pot înregistra fişierul rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Arhitectură incompatibilă pentru rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "eroare la înregistrarea pachetelor locale"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Operaţiune interzisă în timpul rulării în mod restricţionat"
@@ -571,22 +571,22 @@ msgstr "nici o expresie de închis"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "urpmf aşteaptă implicit un regexp. utilizaţi opţiunea \"--literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "directorul chroot nu există"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Nu se poate utiliza %s fără %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Nu se poate utiliza %s cu %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Prea multe argumente\n"
@@ -682,82 +682,87 @@ msgstr "%s a eşuat: terminare cu mesajul %d"
 msgid "%s failed: exited with %d"
 msgstr "%s a eşuat: terminare cu %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "copierea a eşuat"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "datorită lipsei wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "datorită lipsei curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl a eşuat: descărcare anulată\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "lipseşte rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "lipseşte ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "lipseşte prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Nu s-a putut rula prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "datorită lipsei aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% din %s terminat, ETA = %s, viteza = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% terminat, viteza = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "primire %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "s-a primit %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol necunoscut definit pentru %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nu gasesc webfech, versiunile suportate sunt: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nu pot folosi protocolul: %s"
@@ -777,12 +782,12 @@ msgstr "pachetul %s nu a fost găsit."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "copiere fişiere rpm de pe mediul \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[reîmpachetare]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -790,47 +795,47 @@ msgstr ""
 "tranzacţie creeată pentru instalarea pe %s (ştergere=%d, instalare=%d, "
 "actualizare=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "nu se poate crea tranzacţia"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "nu se poate extrage rpm-ul din pachetul delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "nu pot instala pachetul %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "ştergere rpm deteriorat (%s) din %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "ştergerea %s eşuată: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Se şterge pachetul %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "şterg pachetul %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "ştergere rpm-uri instalate (%s) din %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Mai multe informaţii despre pachetul %s"
@@ -875,18 +880,23 @@ msgstr "întrerupere"
 msgid "%s database is locked (another program is already using it)"
 msgstr "baza de date %s este blocată (utilizată deja de alt program)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalarea a eşuat"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Încercaţi totuşi? (d/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -895,57 +905,57 @@ msgstr ""
 "Instalarea a eşuat, rpm-uri eronate:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Următoarele pachete au semnături greşite"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Următoarele pachete au semnături greşite"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Doriţi să continuaţi instalarea?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "ştergere rpm-uri instalate (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribui %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "instalare %s din %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instalez %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Să încerc instalarea fără verificarea dependenţelor? (d/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Încercare instalare forţată (--force)? (d/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pachetele sunt actualizate"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalarea este posibilă"
@@ -1151,7 +1161,7 @@ msgstr "copierea fişierului [%s] a eşuat (fişier suspect de mic)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "se calculează md5sum pentru fişierului synthesis descărcat"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "descărcarea [%s] a eşuat (eroare md5sum)"
@@ -1191,32 +1201,32 @@ msgstr "nu s-a găsit fişierul de metadate pentru mediul \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "se primeşte sursa synthesis pentru \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinez fişierul cheie publică pentru \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...cheia importată %s din fişierul cheie publică pentru \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nu pot importa fişierul cheie publică pentru \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nu s-a găsit fişierul synthesis pentru mediul \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "mediul \"%s\" actualizat"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "primirea [%s] a eşuat"
@@ -1231,94 +1241,99 @@ msgstr "se reîncearcă cu serverul %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Nu s-a găsit un server din lista de servere %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "localizarea geografică %s %.2f % găsită.2f din fusul orar %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "primire listă servere de la %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "DdYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (d/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Aţi ales greşit, încercaţi din nou\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pachet"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versiune"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Ediţie"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arh"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(sugerat)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "mediul \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "linie de comandă"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1410,304 +1425,6 @@ msgstr "montare %s"
 msgid "unmounting %s"
 msgstr "demontare %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf versiunea %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
-"\n"
-"utilizare: urpmf [opţiuni] tipar-expresie\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - afişarea versiunii utilitarului.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - foloseşte un mediu specificat (tipic un raport de "
-"erori).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - nu folosiţi mediile date, separate prin virgulă.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - nu potriviţi modelele, utlizaţi argumentul ca literal.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - folosirea altui administrator pentru urpmi db & "
-"instalarea rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortează mediile conform subşirurilor separate prin "
-"virgulă.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - se utilizează calea indicată către mediu \n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - foloseşte fişierul synthesis dat în loc de urpmi db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - nu afişează liniile identice.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "   --verbose      - mod detaliat.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignoră diferenţierea majusculelor în toate modelele.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - utilizarea diferitelor majuscule în modele (implicit).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - schimbaţi câmpul separator (implicit ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Expresii regulate:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text         - orice text este parcurs ca regexp, exceptând utilizarea -"
-"l.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include codul perl direct ca perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operator binar ŞI.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operator binar SAU.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !             - Negare unară.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - paranteze stânga şi dreapta.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Listă de etichete:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - se specifică un format de ieşire tip printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   exemplu: '%%nume:%%fişiere'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - architectură\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - compilare host\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - la compilare\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - fişiere de configurare\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - marcaj conflicte\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - descrierea pachetului\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribuţie\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epocă\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - numele fişierelor pachetelor\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - afişarea fişierelor conţinute în pachet\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grup\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licenţă\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - numele pachetului\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - marcaj ca perimat\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - creator\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - marcaj ofertă\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - marcaj necesar\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - spaţiu instalat\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nume rpm sursă\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - marcaj recomandat\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - sumar\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - vânzător\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - mediul în care s-a găsit pachetul\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - afişează versiune, ediţie şi arhitectură cu nume.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-"Format incorect: puteţi utiliza numai o singură etichetă cu valori multiple"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nu este disponibil un hdlist  pentru mediul \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "nu este disponibil un synthesis pentru mediul \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "nu sunt disponibile informaţii xml  pentru mediul \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1725,7 +1442,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nici un pachet numit %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Următoarele pachete conţin %s: %s"
@@ -1735,47 +1452,47 @@ msgstr "Următoarele pachete conţin %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Ar trebui să utilizaţi \"-a\" pentru a-i utiliza pe toţi"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "s-a găsit pachetul(ele) %s în urpmi db, dar nu este instalat"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pachetul %s este instalat deja"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pachetele %s sunt instalate deja"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "datorită lipsei %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "%s este deja instalat"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "datorită %s nesatisfăcute"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "încerc să promovez %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "pentru a păstra %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1784,7 +1501,7 @@ msgstr ""
 "Următoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1793,12 +1510,12 @@ msgstr ""
 "Unrmătoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "pentru a instala %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "datorita conflictelor cu %s"
@@ -1892,6 +1609,14 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - folosiţi alt administrator pentru ştergerea rpm-urilor.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - folosirea altui administrator pentru urpmi db & "
+"instalarea rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1926,22 +1651,22 @@ msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selectează toate pachetele ce se potrivesc cu expresia.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Doar administratorul poate şterge pachete"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pachete necunoscute "
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pachet necunoscut "
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1949,17 +1674,17 @@ msgstr[0] "Ştergerea următorului pachet va corupe sistemul:"
 msgstr[1] "Ştergerea următoarelor pachete va corupe sistemul:"
 msgstr[2] "Ştergerea următoarelor pachete va corupe sistemul:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nimic de şters"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Nu sunt pachete inutile de şters"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1970,7 +1695,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Pentru satisfacerea dependenţelor, următoarele %d pachete vor fi şterse"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1978,7 +1703,7 @@ msgstr[0] "(pachet inutil)"
 msgstr[1] "(pachete inutile)"
 msgstr[2] "(pachete inutile)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1986,31 +1711,315 @@ msgstr[0] "Se şterge %d pachet?"
 msgstr[1] "Se şterg %d pachete?"
 msgstr[2] "Se şterg %d pachete?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (d/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "se verifică ştergerea %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Ştergere nereuşită"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Ştergere posibilă"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf versiunea %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
+"\n"
+"utilizare: urpmf [opţiuni] tipar-expresie\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - afişarea versiunii utilitarului.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - foloseşte un mediu specificat (tipic un raport de "
+"erori).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - nu folosiţi mediile date, separate prin virgulă.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - nu potriviţi modelele, utlizaţi argumentul ca literal.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sortează mediile conform subşirurilor separate prin "
+"virgulă.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - se utilizează calea indicată către mediu \n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - foloseşte fişierul synthesis dat în loc de urpmi db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - nu afişează liniile identice.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "   --verbose      - mod detaliat.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignoră diferenţierea majusculelor în toate modelele.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - utilizarea diferitelor majuscule în modele (implicit).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - schimbaţi câmpul separator (implicit ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Expresii regulate:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text         - orice text este parcurs ca regexp, exceptând utilizarea -"
+"l.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include codul perl direct ca perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operator binar ŞI.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operator binar SAU.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !             - Negare unară.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - paranteze stânga şi dreapta.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Listă de etichete:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - se specifică un format de ieşire tip printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   exemplu: '%%nume:%%fişiere'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - architectură\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - compilare host\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - la compilare\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - fişiere de configurare\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - marcaj conflicte\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - descrierea pachetului\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribuţie\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epocă\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - numele fişierelor pachetelor\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - afişarea fişierelor conţinute în pachet\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grup\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licenţă\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - numele pachetului\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - marcaj ca perimat\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - creator\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - marcaj ofertă\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - marcaj necesar\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - spaţiu instalat\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nume rpm sursă\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - marcaj recomandat\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - sumar\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - vânzător\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - mediul în care s-a găsit pachetul\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - afişează versiune, ediţie şi arhitectură cu nume.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "expresie nedeterminată (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Format incorect: puteţi utiliza numai o singură etichetă cu valori multiple"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nu este disponibil un hdlist  pentru mediul \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "nu este disponibil un synthesis pentru mediul \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "nu sunt disponibile informaţii xml  pentru mediul \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2377,36 +2386,31 @@ msgstr ""
 "Eroare: %s pare să nu permită scrierea.\n"
 "Utilizaţi --allow-force pentru forţarea operaţiei."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Actualizare mediu...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (pentru actualizare)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (pentru actualizare)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (pentru instalare)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (pentru instalare)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2415,12 +2419,12 @@ msgstr ""
 "Pentru satisfacerea dependenţelor lui '%s', unul dintre următoarele pachete "
 "este necesar: "
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ce alegeţi? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2431,7 +2435,7 @@ msgstr ""
 "mai vechi decât cele instalate:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2442,7 +2446,7 @@ msgstr ""
 "mai vechi decât cele instalate:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2451,12 +2455,12 @@ msgstr ""
 "\n"
 "Continuaţi totuşi instalarea?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2465,7 +2469,7 @@ msgstr ""
 "Pachetul cerut nu poate fi instalat:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2474,12 +2478,12 @@ msgstr ""
 "Unele pachete cerute nu pot fi instalate:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "ştergerea pachetului %s va deteriora sistemul dvs"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2490,7 +2494,7 @@ msgstr ""
 "trebuie şterse pentru ca altele să fie actualizate:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2501,12 +2505,12 @@ msgstr ""
 "trebuie şterse pentru ca altele să fie actualizate:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(numai test, nu se va efectua ştergerea)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2517,7 +2521,7 @@ msgstr ""
 "dependenţe:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2525,27 +2529,27 @@ msgstr[0] "Următorul pachet inutil va fi şters."
 msgstr[1] "Următoarele pachete inutile vor fi şterse."
 msgstr[2] "Următoarele pachete inutile vor fi şterse."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(numai test, nu se va efectua instalare)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "vor fi utilizaţi adiţional %s din spaţiul de pe disc."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "vor fi eliberaţi %s din spaţiul de pe disc."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s de pachete vor fi primiţi."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2553,12 +2557,12 @@ msgstr[0] "Continuaţi cu instalarea unui pachet?"
 msgstr[1] "Continuaţi cu instalarea a %d pachete?"
 msgstr[2] "Continuaţi cu instalarea a %d pachete?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Apăsaţi Enter după montare..."
@@ -3029,13 +3033,13 @@ msgstr "  -ff            - se forţează suplimentar actualizarea synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Doar administratorul poate actualiza mediile"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nimic de actualizat (folosiţi urpmi.addmedia pentru a adăuga un mediu)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3044,17 +3048,17 @@ msgstr ""
 "intrarea de actualizat lipseşte\n"
 "(una din %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "mediul %s ignorat"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "mediul %s activat"
@@ -3345,6 +3349,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nu s-a gasit changelog\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Actualizare mediu...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "examinare fişier %s"
 
diff --git a/po/ru.po b/po/ru.po
index 395717d8..422f3d10 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-11-12 16:07+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -26,32 +26,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:31
-#: ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Установка RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Ошибка: не удаётся найти файл %s, операция отменяется"
 
-#: ../gurpmi:46
-#: ../gurpmi2:174
-#: ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_ОК"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -64,8 +62,7 @@ msgstr ""
 "\n"
 "Что нужно сделать?"
 
-#: ../gurpmi:74
-#: ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -80,7 +77,7 @@ msgstr ""
 "\n"
 "Продолжить?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -95,40 +92,40 @@ msgstr ""
 "\n"
 "Пакет можно просто сохранить. Что нужно сделать?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Установить"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../gurpmi:100
-#: ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Укажите местоположение для сохранения файла"
 
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
 #, c-format
 msgid ""
 "urpmi 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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpmi версия %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
 "\n"
 "использование:\n"
 
@@ -137,44 +134,37 @@ 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 ../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 "  --help         - показать эту справку\n"
 
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
-msgstr "  --auto         - неинтерактивный режим; на вопросы даются ответы по умолчанию\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+"  --auto         - неинтерактивный режим; на вопросы даются ответы по "
+"умолчанию\n"
 
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - автоматически выбрать пакеты для обновления системы\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - автоматически выбрать пакеты для обновления системы\n"
 
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - принудительно выполнить, даже если некоторые пакеты\n"
 "                   не существуют\n"
 
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -183,45 +173,40 @@ msgstr ""
 "  --verify-rpm   - проверять подписи rpm перед установкой\n"
 "                   (--no-verify-rpm отключает её; по умолчанию включена)\n"
 
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - использовать только указанные источники,\n"
 "                   перечисленные через запятую\n"
 
-#: ../gurpmi.pm:53
-#: ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - разрешить искать пакеты в provides\n"
 
-#: ../gurpmi.pm:54
-#: ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - не искать пакеты в provides\n"
 
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - использовать другой корень для установки rpm-файла\n"
+msgstr ""
+"  --root         - использовать другой корень для установки rpm-файла\n"
 
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
 msgstr "  --test         - проверить возможность корректной установки\n"
 
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - использование только указанных источников для поиска\n"
 "                   запрошенных пакетов\n"
@@ -231,12 +216,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Пакеты не указаны"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Подождите, пожалуйста..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Необходимы права пользователя «root»"
@@ -267,43 +252,42 @@ msgstr ""
 "%s\n"
 "Продолжить установку?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../gurpmi2:134
-#: ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "ОК"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (обновить)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (установить)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Выбор пакета"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Нужен один из следующих пакетов:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Прервать"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -314,60 +298,63 @@ msgstr ""
 "%s\n"
 "Всё равно продолжить установку?"
 
-#: ../gurpmi2:240
-#: ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Для удовлетворения зависимостей будет установлен следующий пакет:"
 
-#: ../gurpmi2:241
-#: ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Для удовлетворения зависимостей будут установлены следующие пакеты:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d пакет, %d МБ)"
 msgstr[1] "(%d пакетов, %d МБ)"
 
-#: ../gurpmi2:257
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "не удаётся получить пакеты с исходными кодами, аварийное завершение"
 
-#: ../gurpmi2:265
-#: ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Подготовка..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Устанавливается пакет «%s» (%s/%s)..."
 
-#: ../gurpmi2:286
-#: ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Вставьте носитель под названием «%s»"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Загружается пакет «%s»..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...извлечение не удалось: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Готово"
 
-#: ../gurpmi2:331
-#: ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -378,33 +365,27 @@ msgstr ""
 "%s\n"
 "Возможно, необходимо обновить базу данных urpmi"
 
-#: ../gurpmi2:337
-#: ../urpm/main_loop.pm:226
-#: ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262
-#: ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Установка не удалась:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Всё уже установлено"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Установка завершена"
 
-#: ../gurpmi2:345
-#: ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "удаляется %s"
 
-#: ../gurpmi2:353
-#: ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi перезапускается"
@@ -443,8 +424,7 @@ msgstr "                    по умолчанию %s\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - показать полное название rpm (NVRA)\n"
 
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Только суперпользователю разрешается устанавливать пакеты"
@@ -474,76 +454,62 @@ msgstr "Не удаётся загрузить пакеты в %s"
 msgid "Environment directory %s does not exist"
 msgstr "Каталог окружения %s не существует"
 
-#: ../urpm.pm:141
-#: ../urpmf:248
-#: ../urpmq:165
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "используется специфическое окружение для %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "не удаётся открыть базу данных RPM"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "недопустимое название rpm-файла [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "извлекается rpm-файл [%s] ..."
 
-#: ../urpm.pm:327
-#: ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...извлечение выполнено"
 
-#: ../urpm.pm:330
-#: ../urpm/download.pm:777
-#: ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830
-#: ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...извлечение не удалось: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "нет доступа к rpm-файлу [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "не удаётся разобрать spec-файл %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "не удаётся зарегистрировать rpm-файл"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Несовместимая архитектура для [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "ошибка регистрации локальных пакетов"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Эта операция запрещена при работе в ограниченном режиме"
 
-#: ../urpm/args.pm:152
-#: ../urpm/args.pm:161
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "неверное объявление proxy в командной строке\n"
@@ -566,7 +532,8 @@ msgstr "перед %s отсутствует выражение"
 #: ../urpm/args.pm:390
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
-msgstr "неожиданное выражение %s (рекомендация: используйте параметр -a или -o)"
+msgstr ""
+"неожиданное выражение %s (рекомендация: используйте параметр -a или -o)"
 
 #: ../urpm/args.pm:394
 #, c-format
@@ -576,48 +543,50 @@ msgstr "отсутствует выражения для закрытия"
 #: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "по умолчанию urpmf ожидает регулярное выражение. Используйте параметр «--literal»"
+msgstr ""
+"по умолчанию urpmf ожидает регулярное выражение. Используйте параметр «--"
+"literal»"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Каталог chroot не существует"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s нельзя использовать без %s"
 
-#: ../urpm/args.pm:497
-#: ../urpm/args.pm:500
-#: ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s нельзя использовать без %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Слишком много аргументов\n"
 
-#: ../urpm/bug_report.pm:54
-#: ../urpmi:259
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Копирование не удалось"
 
 #: ../urpm/cdrom.pm:66
 #, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "CD-ROM необходимо смонтировать вручную (или установите perl-Hal-Cdroms, чтобы это выполнялось автоматически)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"CD-ROM необходимо смонтировать вручную (или установите perl-Hal-Cdroms, "
+"чтобы это выполнялось автоматически)"
 
 #: ../urpm/cdrom.pm:68
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "HAL-демон (hald) не запущен или не готов к работе"
 
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "источник «%s» недоступен"
@@ -642,9 +611,7 @@ msgstr "не удаётся прочитать конфигурационный
 msgid "medium `%s' is defined twice, aborting"
 msgstr "источник «%s» определён дважды; останов"
 
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:497
-#: ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "не удаётся записать конфигурационный файл [%s]"
@@ -657,7 +624,9 @@ msgstr "%s недоступен, выполняется откат до %s"
 #: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "не удаётся прочитать параметры прокси-сервера (недостаточно прав, чтобы прочитать %s)"
+msgstr ""
+"не удаётся прочитать параметры прокси-сервера (недостаточно прав, чтобы "
+"прочитать %s)"
 
 #: ../urpm/download.pm:182
 #, c-format
@@ -689,82 +658,87 @@ msgstr "сбой %s: завершён с сигналом %d"
 msgid "%s failed: exited with %d"
 msgstr "сбой %s: завершён с %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "сбой копирования"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "Отсутствует wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "Отсутствует curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "сбой curl: загрузка отменена\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "Отсутствует rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "Отсутствует ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "Отсутствует prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Не удаётся запустить prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "Отсутствует aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% из %s завершено, осталось времени = %s, скорость = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% завершено, скорость = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "загружается %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "загружено %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "для %s определён неизвестный протокол"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "не найден webfetch; поддерживаемые webfetch: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "не удаётся обработать протокол: %s"
@@ -784,58 +758,59 @@ msgstr "пакет %s не найден."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "загружаются rpm-файлы из источника «%s»..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[повторная упаковка]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "не удаётся создать транзакцию"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "не удаётся извлечь rpm-файл из пакета delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "не удаётся установить пакет %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "удаляются неверные rpm-файлы (%s) из %s"
 
-#: ../urpm/install.pm:212
-#: ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "не удалось удалить %s: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Удаляется пакет %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "удаляется пакет %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "удаляются установленные rpm-файлы (%s) из %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Дополнительная информация о пакете %s"
@@ -860,8 +835,7 @@ msgstr "Сервер не определён; отсутствует URI или
 msgid "No base defined"
 msgstr "База не определена"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Не удаётся подключиться к ldap по URI:"
@@ -881,22 +855,23 @@ msgstr "прерывается"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s база заблокирована (возможно ее использует другая программа)"
 
-#: ../urpm/main_loop.pm:113
-#: ../urpm/main_loop.pm:123
-#: ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233
-#: ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Установка не удалась"
 
-#: ../urpm/main_loop.pm:115
-#: ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Попробовать в любом случае? (y/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -905,58 +880,57 @@ msgstr ""
 "Не удалось установить; неверные rpm-файлы:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Следующий пакет имеет неверную подпись"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Следующие пакеты имеют неверные подписи"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Продолжить установку?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "удаляются установленные rpm-файлы (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "распределяется %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "устанавливается %s из %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "устанавливается %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Продолжить установку без проверки зависимостей? (y/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Попробовать принудительную установку (--force)? (y/N)"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Пакеты находятся в актуальном состоянии"
 
-#: ../urpm/main_loop.pm:313
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Установка возможна."
@@ -969,7 +943,8 @@ msgstr "предупреждение: в файле MD5SUM нет md5-суммы
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "виртуальный источник «%s» должен содержать пустой url; источник проигнорирован"
+msgstr ""
+"виртуальный источник «%s» должен содержать пустой url; источник проигнорирован"
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -989,10 +964,10 @@ msgstr "попытка переопределить существующий и�
 #: ../urpm/media.pm:456
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
-msgstr "не удалось выполнить миграцию съёмного устройства; источник игнорируется"
+msgstr ""
+"не удалось выполнить миграцию съёмного устройства; источник игнорируется"
 
-#: ../urpm/media.pm:499
-#: ../urpm/media.pm:505
+#: ../urpm/media.pm:499 ../urpm/media.pm:505
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "записан конфигурационный файл [%s]"
@@ -1009,8 +984,12 @@ msgstr "используется связанный источник для ре
 
 #: ../urpm/media.pm:572
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "параметр --synthesis нельзя использовать с --media, --excludemedia, --sortmedia, --update или --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"параметр --synthesis нельзя использовать с --media, --excludemedia, --"
+"sortmedia, --update или --parallel"
 
 #: ../urpm/media.pm:666
 #, c-format
@@ -1127,15 +1106,12 @@ msgstr "изучается файл synthesis [%s]"
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблема чтения файла synthesis источника «%s»"
 
-#: ../urpm/media.pm:1168
-#: ../urpm/media.pm:1263
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "копируется [%s] для источника «%s»..."
 
-#: ../urpm/media.pm:1170
-#: ../urpm/media.pm:1240
-#: ../urpm/media.pm:1493
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
 #, c-format
 msgid "...copying failed"
 msgstr "...копирование не удалось"
@@ -1145,8 +1121,7 @@ msgstr "...копирование не удалось"
 msgid "copying description file of \"%s\"..."
 msgstr "копируется файл описания для «%s»..."
 
-#: ../urpm/media.pm:1238
-#: ../urpm/media.pm:1267
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...копирование выполнено"
@@ -1161,8 +1136,7 @@ msgstr "копирование [%s] не удалось (файл подозри
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "вычисляется md5-сумма для загруженного synthesis-файла источника"
 
-#: ../urpm/media.pm:1319
-#: ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "копирование [%s] не удалось (md5-суммы не совпадают)"
@@ -1202,38 +1176,37 @@ msgstr "для источника «%s» не найдены метаданны�
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "загружается synthesis-файл источника из «%s»..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "проверяется файл открытого ключа для «%s»..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...импортирован ключ %s из файла открытого ключа «%s»"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "не удаётся импортировать файл открытого ключа «%s»"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "не найден synthesis-файл для источника «%s»"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "обновлён источник «%s»"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "не удалось загрузить [%s]"
 
-#: ../urpm/mirrors.pm:19
-#: ../urpm/mirrors.pm:40
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
 #, c-format
 msgid "trying again with mirror %s"
 msgstr "повторная попытка с зеркала %s"
@@ -1243,107 +1216,112 @@ msgstr "повторная попытка с зеркала %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Не удаётся найти зеркало из списка зеркал %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "найдено географическое расположение %s %.2f %.2f из часового пояса %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "загружается список зеркал из %s"
 
-#: ../urpm/msg.pm:63
-#: ../urpmi:502
-#: ../urpmi:517
-#: ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "NnНн"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:553
-#: ../urpmi:648
-#: ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyДд"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Извините, плохой выбор, попробуйте ещё раз\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Пакет"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Версия"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Релиз"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Платформа"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(рекомендуется)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "источник «%s»"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "командная строка"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "Б"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "КБ"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "МБ"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "ГБ"
 
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "ТБ"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "Следующий пакет теперь является осиротевшим, для его удаления используйте команду «urpme --auto-orphans»"
-msgstr[1] "Следующие пакеты теперь являются осиротевшими, для их удаления используйте команду «urpme --auto-orphans»"
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"Следующий пакет теперь является осиротевшим, для его удаления используйте "
+"команду «urpme --auto-orphans»"
+msgstr[1] ""
+"Следующие пакеты теперь являются осиротевшими, для их удаления используйте "
+"команду «urpme --auto-orphans»"
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1397,16 +1375,19 @@ msgstr "сбой cp на хосте %s (%d)"
 
 #: ../urpm/parallel_ssh.pm:86
 #, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "Сбой %s на хосте %s (возможно он имеет неверную версию urpmi?) (код выхода: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"Сбой %s на хосте %s (возможно он имеет неверную версию urpmi?) (код выхода: %"
+"d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "нет доступа к источнику «%s»."
 
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "монтируется %s"
@@ -1416,140 +1397,396 @@ msgstr "монтируется %s"
 msgid "unmounting %s"
 msgstr "отмонтируется %s"
 
-#: ../urpm/search.pm:29
+#: ../urpm/select.pm:30
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "urpmi был перезапущен; список приоритетов пакетов не изменился"
+
+#: ../urpm/select.pm:32
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
+
+#: ../urpm/select.pm:170
+#, c-format
+msgid "No package named %s"
+msgstr "Нет пакета с названием %s"
+
+#: ../urpm/select.pm:172 ../urpme:117
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Следующие пакеты содержат %s: %s"
+
+#: ../urpm/select.pm:174
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr "Чтобы выбрать все, используйте параметр «-a»"
+
+#: ../urpm/select.pm:294
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "в базе данных найдены пакеты %s, но ни один из ни не установлен"
+
+#: ../urpm/select.pm:537
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Пакет %s уже установлен"
+
+#: ../urpm/select.pm:538
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Пакеты %s уже установлен"
+
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#, c-format
+msgid "due to missing %s"
+msgstr "из-за отсутствия %s"
+
+#: ../urpm/select.pm:557
+#, c-format
+msgid "due to already installed %s"
+msgstr "из-за того, что %s уже установлен"
+
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "из-за неудовлетворённости %s"
+
+#: ../urpm/select.pm:564
+#, c-format
+msgid "trying to promote %s"
+msgstr "попытка активизировать %s"
+
+#: ../urpm/select.pm:565
+#, c-format
+msgid "in order to keep %s"
+msgstr "чтобы сохранить %s"
+
+#: ../urpm/select.pm:606
+#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следующий пакет будет удалён для обновления остальных:\n"
+"%s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следующие пакеты будут удалены для обновления остальных:\n"
+"%s"
+
+#: ../urpm/select.pm:634
+#, c-format
+msgid "in order to install %s"
+msgstr "чтобы установить %s"
+
+#: ../urpm/select.pm:644
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "из-за конфликтов с %s"
+
+#: ../urpm/signature.pm:32
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Неверная подпись (%s)"
+
+#: ../urpm/signature.pm:63
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Неверный Key ID (%s)"
+
+#: ../urpm/signature.pm:65
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Отсутствует подпись (%s)"
+
+#: ../urpm/sys.pm:178
+#, c-format
+msgid "system"
+msgstr "система"
+
+#: ../urpm/sys.pm:213
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Необходимо перезапустить %s для %s"
+
+#: ../urpm/sys.pm:316
+#, c-format
+msgid "Can't write file"
+msgstr "Не удаётся записать файл"
+
+#: ../urpm/sys.pm:316
+#, c-format
+msgid "Can't open file"
+msgstr "Не удаётся открыть файл"
+
+#: ../urpm/sys.pm:329
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Не удаётся переместить файл %s в %s"
+
+#: ../urpme:41
+#, 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"
+msgstr ""
+"urpme версия %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
+"\n"
+"использование:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - автоматически выбрать пакет из предлагаемых\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - удалить сирот\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - проверить возможность корректного удаления\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - распределённое выполнение urpmi через машины алиаса\n"
+
+#: ../urpme:52 ../urpmi:142
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - повторно упаковывать файлы перед удалением\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --root         - использовать другой корень для удаления rpm-файлов\n"
+
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root-root    - использовать другой корень для базы данных urpmi\n"
+"                   и установки пакетов\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - обновить базу данных, но не изменять файловую систему\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - не выполнять scriptlet'ы пакета\n"
+
+#: ../urpme:57
+#, 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"
+msgstr ""
+"  --use-distrib  - настроить urpme на лету из дерева distrib; полезно\n"
+"                   для установки/удаления в/из chroot с параметром --root\n"
+
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - подробный режим\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - выбрать все пакеты, удовлетворяющие выражению\n"
+
+#: ../urpme:75
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Только суперпользователю разрешается удалять пакеты"
+
+#: ../urpme:108
+#, c-format
+msgid "unknown packages"
+msgstr "неизвестные пакеты"
+
+#: ../urpme:108
+#, c-format
+msgid "unknown package"
+msgstr "неизвестный пакет"
+
+#: ../urpme:123
+#, 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] ""
+"после удаления следующих пакетов будет нарушена работа всей системы:"
+
+#: ../urpme:128
+#, c-format
+msgid "Nothing to remove"
+msgstr "Нечего удалять"
+
+#: ../urpme:145
+#, c-format
+msgid "No orphans to remove"
+msgstr "Нет осиротевших пакетов для удаления"
+
+#: ../urpme:151
+#, 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] "Для удовлетворения зависимостей будут удалены следующие %d пакетов"
+
+#: ../urpme:156
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "(осиротевший пакет)"
+msgstr[1] "(осиротевшие пакеты)"
+
+#: ../urpme:163
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Удалить %d пакет?"
+msgstr[1] "Удалить %d пакетов?"
+
+#: ../urpme:168
+#, c-format
+msgid "testing removal of %s"
+msgstr "тестрование удаления из %s"
+
+#: ../urpme:185
+#, c-format
+msgid "Removal failed"
+msgstr "Удаление не удалось"
+
+#: ../urpme:187
+#, c-format
+msgid "Removal is possible"
+msgstr "Удаление возможно"
+
 #: ../urpmf:29
 #, 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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
 "urpmf версия %s\n"
 "Copyright (C) 2002-2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
 "\n"
 "использование: urpmf [параметры] путь-выражение\n"
 
-#: ../urpm/search.pm:36
 #: ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - показать номер версии программы\n"
 
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - использовать особое окружение (обычно отчёт\n"
 "                   об ошибке)\n"
 
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - не использовать указанные источники,\n"
 "                   перечисленные через запятую\n"
 
-#: ../urpm/search.pm:39
 #: ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - не искать соответствия шаблону, использовать аргумент\n"
 "                   как буквенную строку\n"
 
-#: ../urpm/search.pm:40
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:72
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:70
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root-root    - использовать другой корень для базы данных urpmi\n"
-"                   и установки пакетов\n"
-
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - сортировать источники по подстрокам, перечисленным\n"
 "                   через запятую.\n"
 
-#: ../urpm/search.pm:43
 #: ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - использовать указанный путь к источнику\n"
 
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - использовать указанный synthesis вместо БД urpmi\n"
 
-#: ../urpm/search.pm:45
 #: ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - не выводить идентичные строки\n"
 
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - использовать только источник обновления\n"
 
-#: ../urpm/search.pm:47
 #: ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - подробный режим\n"
 
-#: ../urpm/search.pm:48
 #: ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - не учитывать регистр в шаблонах\n"
 
-#: ../urpm/search.pm:49
 #: ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - учитывать регистр в шаблонах (по умолчанию)\n"
 
-#: ../urpm/search.pm:50
 #: ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - изменить разделитель полей (по умолчанию - ':')\n"
 
-#: ../urpm/search.pm:51
 #: ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Выражения для шаблонов:\n"
 
-#: ../urpm/search.pm:52
 #: ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
@@ -1557,526 +1794,197 @@ msgstr ""
 "  text           - любой текст считается регулярным выражением,\n"
 "                   если только не используется -l\n"
 
-#: ../urpm/search.pm:53
 #: ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - включить код perl непосредственно как perl -e\n"
 
-#: ../urpm/search.pm:54
 #: ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - двоичный оператор AND\n"
 
-#: ../urpm/search.pm:55
 #: ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - бинарный оператор OR\n"
 
-#: ../urpm/search.pm:56
 #: ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - унарный NOT\n"
 
-#: ../urpm/search.pm:57
 #: ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - левая и правая скобки\n"
 
-#: ../urpm/search.pm:58
 #: ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Список тегов:\n"
 
-#: ../urpm/search.pm:59
 #: ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - выходной формат в стиле printf\n"
 
-#: ../urpm/search.pm:60
 #: ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   пример: '%%name:%%files'\n"
 
-#: ../urpm/search.pm:61
 #: ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - архитектура\n"
 
-#: ../urpm/search.pm:62
 #: ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - машина, на которой был собран пакет\n"
 
-#: ../urpm/search.pm:63
 #: ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - время сборки\n"
 
-#: ../urpm/search.pm:64
 #: ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - конфигурационные файлы\n"
 
-#: ../urpm/search.pm:65
 #: ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - конфликтующие теги\n"
 
-#: ../urpm/search.pm:66
 #: ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - описание пакета\n"
 
-#: ../urpm/search.pm:67
 #: ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - дистрибутив\n"
 
-#: ../urpm/search.pm:68
 #: ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epoch\n"
 
-#: ../urpm/search.pm:69
 #: ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - имя пакета\n"
 
-#: ../urpm/search.pm:70
 #: ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - список файлов в пакете\n"
 
-#: ../urpm/search.pm:71
 #: ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - группа\n"
 
-#: ../urpm/search.pm:72
 #: ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - лицензия\n"
 
-#: ../urpm/search.pm:73
 #: ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - имя пакета\n"
 
-#: ../urpm/search.pm:74
 #: ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - теги obsoletes (устаревшие)\n"
 
-#: ../urpm/search.pm:75
 #: ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - создатель пакета\n"
 
-#: ../urpm/search.pm:76
 #: ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - теги provides (предоставляются)\n"
 
-#: ../urpm/search.pm:77
 #: ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - теги requires (требуются)\n"
 
-#: ../urpm/search.pm:78
 #: ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - установленный размер\n"
 
-#: ../urpm/search.pm:79
 #: ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - rpm с исходными кодами\n"
 
-#: ../urpm/search.pm:80
 #: ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - теги suggests (рекомендуются)\n"
 
-#: ../urpm/search.pm:81
 #: ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - сводка\n"
 
-#: ../urpm/search.pm:82
 #: ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpm/search.pm:83
 #: ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - поставщик\n"
 
-#: ../urpm/search.pm:84
 #: ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - источник, в котором был найден пакет\n"
 
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:99
+#: ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - показать версию, релиз и архитектуру с названием\n"
 
-#: ../urpm/search.pm:197
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "незавершённое выражение (%s)"
+
 #: ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Неверный формат: можно использовать только один тег с несколькими значениями"
+msgstr ""
+"Неверный формат: можно использовать только один тег с несколькими значениями"
 
-#: ../urpm/search.pm:290
 #: ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "для источника «%s» не найден файл hdlist"
 
-#: ../urpm/search.pm:297
 #: ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "для источника «%s» не найден файл synthesis"
 
-#: ../urpm/search.pm:304
 #: ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "для источника «%s» не найден файл xml-info"
 
-#: ../urpm/select.pm:30
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi был перезапущен; список приоритетов пакетов не изменился"
-
-#: ../urpm/select.pm:32
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
-
-#: ../urpm/select.pm:170
-#, c-format
-msgid "No package named %s"
-msgstr "Нет пакета с названием %s"
-
-#: ../urpm/select.pm:172
-#: ../urpme:115
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Следующие пакеты содержат %s: %s"
-
-#: ../urpm/select.pm:174
-#, c-format
-msgid "You should use \"-a\" to use all of them"
-msgstr "Чтобы выбрать все, используйте параметр «-a»"
-
-#: ../urpm/select.pm:295
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "в базе данных найдены пакеты %s, но ни один из ни не установлен"
-
-#: ../urpm/select.pm:538
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Пакет %s уже установлен"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Пакеты %s уже установлен"
-
-#: ../urpm/select.pm:557
-#: ../urpm/select.pm:641
-#, c-format
-msgid "due to missing %s"
-msgstr "из-за отсутствия %s"
-
-#: ../urpm/select.pm:558
-#, c-format
-msgid "due to already installed %s"
-msgstr "из-за того, что %s уже установлен"
-
-#: ../urpm/select.pm:559
-#: ../urpm/select.pm:639
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "из-за неудовлетворённости %s"
-
-#: ../urpm/select.pm:565
-#, c-format
-msgid "trying to promote %s"
-msgstr "попытка активизировать %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "in order to keep %s"
-msgstr "чтобы сохранить %s"
-
-#: ../urpm/select.pm:607
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следующий пакет будет удалён для обновления остальных:\n"
-"%s"
-
-#: ../urpm/select.pm:608
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следующие пакеты будут удалены для обновления остальных:\n"
-"%s"
-
-#: ../urpm/select.pm:635
-#, c-format
-msgid "in order to install %s"
-msgstr "чтобы установить %s"
-
-#: ../urpm/select.pm:645
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "из-за конфликтов с %s"
-
-#: ../urpm/signature.pm:32
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Неверная подпись (%s)"
-
-#: ../urpm/signature.pm:63
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Неверный Key ID (%s)"
-
-#: ../urpm/signature.pm:65
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Отсутствует подпись (%s)"
-
-#: ../urpm/sys.pm:178
-#, c-format
-msgid "system"
-msgstr "система"
-
-#: ../urpm/sys.pm:213
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Необходимо перезапустить %s для %s"
-
-#: ../urpm/sys.pm:316
-#, c-format
-msgid "Can't write file"
-msgstr "Не удаётся записать файл"
-
-#: ../urpm/sys.pm:316
-#, c-format
-msgid "Can't open file"
-msgstr "Не удаётся открыть файл"
-
-#: ../urpm/sys.pm:329
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Не удаётся переместить файл %s в %s"
-
-#: ../urpme:41
-#, 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"
-msgstr ""
-"urpme версия %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
-"\n"
-"использование:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - автоматически выбрать пакет из предлагаемых\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - удалить сирот\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - проверить возможность корректного удаления\n"
-
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - распределённое выполнение urpmi через машины алиаса\n"
-
-#: ../urpme:52
-#: ../urpmi:142
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - повторно упаковывать файлы перед удалением\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - использовать другой корень для удаления rpm-файлов\n"
-
-#: ../urpme:55
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - обновить базу данных, но не изменять файловую систему\n"
-
-#: ../urpme:56
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - не выполнять scriptlet'ы пакета\n"
-
-#: ../urpme:57
-#, 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"
-msgstr ""
-"  --use-distrib  - настроить urpme на лету из дерева distrib; полезно\n"
-"                   для установки/удаления в/из chroot с параметром --root\n"
-
-#: ../urpme:59
-#: ../urpmi:153
-#: ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - подробный режим\n"
-
-#: ../urpme:60
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - выбрать все пакеты, удовлетворяющие выражению\n"
-
-#: ../urpme:73
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Только суперпользователю разрешается удалять пакеты"
-
-#: ../urpme:106
-#, c-format
-msgid "unknown packages"
-msgstr "неизвестные пакеты"
-
-#: ../urpme:106
-#, c-format
-msgid "unknown package"
-msgstr "неизвестный пакет"
-
-#: ../urpme:121
-#, 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] "после удаления следующих пакетов будет нарушена работа всей системы:"
-
-#: ../urpme:126
-#, c-format
-msgid "Nothing to remove"
-msgstr "Нечего удалять"
-
-#: ../urpme:143
-#, c-format
-msgid "No orphans to remove"
-msgstr "Нет осиротевших пакетов для удаления"
-
-#: ../urpme:149
-#, 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] "Для удовлетворения зависимостей будут удалены следующие %d пакетов"
-
-#: ../urpme:154
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "(осиротевший пакет)"
-msgstr[1] "(осиротевшие пакеты)"
-
-#: ../urpme:161
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Удалить %d пакет?"
-msgstr[1] "Удалить %d пакетов?"
-
-#: ../urpme:161
-#: ../urpmi:554
-#: ../urpmi:649
-#: ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
-#, c-format
-msgid "testing removal of %s"
-msgstr "тестрование удаления из %s"
-
-#: ../urpme:181
-#, c-format
-msgid "Removal failed"
-msgstr "Удаление не удалось"
-
-#: ../urpme:183
-#, c-format
-msgid "Removal is possible"
-msgstr "Удаление возможно"
-
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "незавершённое выражение (%s)"
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2097,31 +2005,33 @@ msgstr "    --force-key    - принудительно обновить gpg-к�
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - удалить сирот без вывода запроса\n"
 
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - не выбирать автоматически рекомендованные пакеты\n"
 
 #: ../urpmi:86
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr "  --no-uninstall - никогда не предлагать удалять пакет, прерывать установку\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - никогда не предлагать удалять пакет, прерывать установку\n"
 
 #: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - не устанавливать пакеты (только загрузить)\n"
 
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
 "  --keep         - по возможности сохранять существующие пакеты,\n"
-"                   отклонять запрошенные пакеты, которые приводят к удалению\n"
+"                   отклонять запрошенные пакеты, которые приводят к "
+"удалению\n"
 
 #: ../urpmi:90
 #, c-format
@@ -2168,7 +2078,8 @@ msgstr "  --noclean      - не удалять rpm-файлы из кэша\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - принудительно установить уже установленные пакеты\n"
 
 #: ../urpmi:104
@@ -2203,9 +2114,7 @@ msgstr ""
 "  --use-distrib  - настроить urpmi на лету из дерева distrib; полезно\n"
 "                   для установки в chroot с параметром --root\n"
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr "  --metalink     - сгенерировать и использовать локальные метассылки\n"
@@ -2222,31 +2131,35 @@ msgstr ""
 #: ../urpmi:118
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
-msgstr "  --curl-options - дополнительные параметры, передаваемые в программу curl\n"
+msgstr ""
+"  --curl-options - дополнительные параметры, передаваемые в программу curl\n"
 
 #: ../urpmi:119
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
-msgstr "  --rsync-options- дополнительные параметры, передаваемые в программу rsync\n"
+msgstr ""
+"  --rsync-options- дополнительные параметры, передаваемые в программу rsync\n"
 
 #: ../urpmi:120
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
-msgstr "  --wget-options - дополнительные параметры, передаваемые в программу wget\n"
+msgstr ""
+"  --wget-options - дополнительные параметры, передаваемые в программу wget\n"
 
 #: ../urpmi:121
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
-msgstr "  --prozilla-options - дополнительные параметры, передаваемые в программу prozilla\n"
+msgstr ""
+"  --prozilla-options - дополнительные параметры, передаваемые в программу "
+"prozilla\n"
 
 #: ../urpmi:122
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
-msgstr "  --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
+msgstr ""
+"  --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
 
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ограничить скорость загрузки\n"
@@ -2260,10 +2173,7 @@ msgstr ""
 "  --resume       - возобновить загрузку частично загруженных файлов\n"
 "                   (--no-resume отключает её; по умолчанию отключена)\n"
 
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2272,10 +2182,7 @@ msgstr ""
 "  --proxy        - использовать указанный HTTP-прокси; по умолчанию\n"
 "                   используется порт 1080 (формат - <хост_прокси[:порт]>)\n"
 
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2306,7 +2213,8 @@ msgstr "  --excludedocs  - исключить файлы документаци�
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - не проверять дисковое пространство перед установкой\n"
+msgstr ""
+"  --ignoresize   - не проверять дисковое пространство перед установкой\n"
 
 #: ../urpmi:139
 #, c-format
@@ -2354,8 +2262,7 @@ msgstr "  --nolock       - не блокировать базу данных rpm
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - обновить пакеты только с такой же архитектурой\n"
 
-#: ../urpmi:149
-#: ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - выбрать все совпадения из командной строки\n"
@@ -2373,12 +2280,15 @@ msgstr "  --debug        - очень подробный режим\n"
 #: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  будут установлены имена или rpm-файлы, указанные в командной строке\n"
+msgstr ""
+"  будут установлены имена или rpm-файлы, указанные в командной строке\n"
 
 #: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Ошибка: параметр --auto-select нельзя использовать вместе со списком пакетов.\n"
+msgstr ""
+"Ошибка: параметр --auto-select нельзя использовать вместе со списком "
+"пакетов.\n"
 
 #: ../urpmi:190
 #, c-format
@@ -2392,7 +2302,9 @@ msgstr ""
 #: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
-msgstr "При использовании параметра --install-src нельзя устанавливать бинарные rpm-файлы"
+msgstr ""
+"При использовании параметра --install-src нельзя устанавливать бинарные rpm-"
+"файлы"
 
 #: ../urpmi:221
 #, c-format
@@ -2406,13 +2318,20 @@ msgstr "умолчания для --buildrequires"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "используйте параметр --buildrequires или --install-src (по умолчанию используется --buildrequires)"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"используйте параметр --buildrequires или --install-src (по умолчанию "
+"используется --buildrequires)"
 
 #: ../urpmi:253
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке или удалите его"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке "
+"или удалите его"
 
 #: ../urpmi:254
 #, c-format
@@ -2428,46 +2347,43 @@ msgstr ""
 "Ошибка: похоже, что %s примонтирован только для чтения.\n"
 "Используйте --allow-force для принудительного выполнения операции."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Обновляется источник...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (для обновления)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (для обновления)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (для установки)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (для установки)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
 msgstr "Для удовлетворения зависимости «%s» нужен один из следующих пакетов:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ваш выбор? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2478,7 +2394,7 @@ msgstr ""
 "более старых, чем установленные:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2489,8 +2405,7 @@ msgstr ""
 "более старых, чем установленные:\n"
 "%s"
 
-#: ../urpmi:503
-#: ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2499,15 +2414,12 @@ msgstr ""
 "\n"
 "Продолжить установку?"
 
-#: ../urpmi:504
-#: ../urpmi:519
-#: ../urpmi:613
-#: ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2516,7 +2428,7 @@ msgstr ""
 "Не удаётся установить запрошенный пакет:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2525,12 +2437,12 @@ msgstr ""
 "Не удаётся установить некоторые из запрошенных пакетов:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "удаление пакета %s нарушит работу вашей системы"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2541,7 +2453,7 @@ msgstr ""
 "пакет для обновления остальных:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2552,60 +2464,62 @@ msgstr ""
 "пакеты для обновления остальных:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(только проверка; ничего удалено не будет)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
-"Сначала нужно запустить urpmi с параметром --buildrequires, чтобы установить следующие зависимости:\n"
+"Сначала нужно запустить urpmi с параметром --buildrequires, чтобы установить "
+"следующие зависимости:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Будет удалён следующий осиротевший пакет."
 msgstr[1] "Будут удалены следующие осиротевшие пакеты."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(только проверка, без установки)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Будет использовано %s дополнительного дискового пространства."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Будет особождено %s дискового пространства."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Будет загружено %s пакетов."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Установить один пакет?"
 msgstr[1] "Установить %d пакетов?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "После монтирования нажмите клавишу «Enter»..."
@@ -2643,7 +2557,8 @@ msgstr ""
 "       cdrom://<путь>\n"
 "\n"
 "Использование: urpmi.addmedia [параметры] --distrib --mirrorlist <url>\n"
-"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> <относительный путь>\n"
+"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> "
+"<относительный путь>\n"
 "\n"
 "Примеры:\n"
 "\n"
@@ -2653,29 +2568,23 @@ msgstr ""
 "\n"
 "а [параметры] могут быть следующими\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - использовать wget для загрузки удалённых файлов\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - использовать curl для загрузки удалённых файлов\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
-msgstr "  --prozilla     - использовать prozilla для загрузки удалённых файлов\n"
+msgstr ""
+"  --prozilla     - использовать prozilla для загрузки удалённых файлов\n"
 
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --aria2        - использовать aria2 для загрузки удалённых файлов\n"
@@ -2693,10 +2602,12 @@ msgstr ""
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
 "  --xml-info     - использовать особую политику для загрузки xml-файлов\n"
-"                   варианты: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   варианты: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 
 #: ../urpmi.addmedia:69
 #, c-format
@@ -2752,8 +2663,7 @@ msgstr ""
 "  --virtual      - создать виртуальный источник, который всегда\n"
 "                   является самым актульным\n"
 
-#: ../urpmi.addmedia:80
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - отключить проверку файла MD5SUM\n"
@@ -2761,23 +2671,21 @@ msgstr "  --no-md5sum    - отключить проверку файла MD5SUM
 #: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
-msgstr "  --nopubkey     - не импортировать публичный ключ из добавленного источника\n"
+msgstr ""
+"  --nopubkey     - не импортировать публичный ключ из добавленного "
+"источника\n"
 
 #: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - добавить источник в config, но не обновлять его\n"
 
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - тихий режим (quiet)\n"
 
-#: ../urpmi.addmedia:84
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - подробный режим\n"
@@ -2815,7 +2723,9 @@ msgstr "Не удаётся создать конфигурационный фа
 #: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "с параметром --distrib <относительный путь к файлу synthesis> указывать не нужно"
+msgstr ""
+"с параметром --distrib <относительный путь к файлу synthesis> указывать не "
+"нужно"
 
 #: ../urpmi.addmedia:144
 #, c-format
@@ -2846,13 +2756,15 @@ msgstr "не удаётся добавить источник"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpme.recover версия %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
 "\n"
 "использование:\n"
 
@@ -2864,11 +2776,14 @@ msgstr "  --checkpoint   - установить точку для повторн
 #: ../urpmi.recover:35
 #, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr "  --noclean      - не очищать каталог повторной упаковки в контрольной точке\n"
+msgstr ""
+"  --noclean      - не очищать каталог повторной упаковки в контрольной "
+"точке\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - список транзакций относительно указанной\n"
 "                   даты/продолжительности\n"
@@ -2876,7 +2791,8 @@ msgstr ""
 #: ../urpmi.recover:38
 #, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - список всех транзакций в базе данных rpm (длинный)\n"
+msgstr ""
+"  --list-all     - список всех транзакций в базе данных rpm (длинный)\n"
 
 #: ../urpmi.recover:39
 #, c-format
@@ -2959,8 +2875,7 @@ msgstr "Не найдены транзакции от %s\n"
 msgid "You must be superuser to do this"
 msgstr "Для этого нужны права суперпользователя"
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Записывается файл макроса rpm [%s]...\n"
@@ -3050,7 +2965,9 @@ msgstr "  --no-ignore    - не обновлять, пометить источ�
 #: ../urpmi.update:49
 #, c-format
 msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
-msgstr "  --probe-rpms   - не использовать файл synthesis; использовать непосредственно rpm-файлы\n"
+msgstr ""
+"  --probe-rpms   - не использовать файл synthesis; использовать "
+"непосредственно rpm-файлы\n"
 
 #: ../urpmi.update:50
 #, c-format
@@ -3072,12 +2989,12 @@ msgstr "  -ff            - беспрекословно обновить фай�
 msgid "Only superuser is allowed to update media"
 msgstr "Обновлять источники разрешено только суперпользователю"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нечего обновлять (добавьте источник с помощью urpmi.addmedia)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3086,17 +3003,17 @@ msgstr ""
 "отсутствует пункт для обновления\n"
 "(один из %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "игнорируется источник %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "включается источник %s"
@@ -3106,19 +3023,23 @@ msgstr "включается источник %s"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpmq версия %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
 "\n"
 "использование:\n"
 
 #: ../urpmq:48
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr ""
 "  --searchmedia  - использовать только указанные источники для поиска\n"
 "                   запрошенных (или обновляемых) пакетов\n"
@@ -3151,7 +3072,9 @@ msgstr "  --list-url     - показать список доступных ис
 #: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - показать список доступных узлов при использовании --parallel\n"
+msgstr ""
+"  --list-nodes   - показать список доступных узлов при использовании --"
+"parallel\n"
 
 #: ../urpmq:62
 #, c-format
@@ -3160,17 +3083,22 @@ msgstr "  --list-aliases - показать список доступных ал
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - показать конфигурацию в виде аргумента для urpmi.addmedia\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - показать конфигурацию в виде аргумента для urpmi."
+"addmedia\n"
 
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - следующий пакет содержит исходные коды (эквивалент -s)\n"
+msgstr ""
+"  --src          - следующий пакет содержит исходные коды (эквивалент -s)\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - показать все пакеты с исходными кодами перед загрузкой\n"
 "                   (только для root'a)\n"
@@ -3178,7 +3106,9 @@ msgstr ""
 #: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - разрешить запрашивать rpm-файлы для несоответствующих архитектур\n"
+msgstr ""
+"  --ignorearch   - разрешить запрашивать rpm-файлы для несоответствующих "
+"архитектур\n"
 
 #: ../urpmq:71
 #, c-format
@@ -3250,7 +3180,8 @@ msgid ""
 "                   - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  --whatrequires-recursive\n"
-"                   - расширенный реверсивный поиск (включая виртуальные пакеты)\n"
+"                   - расширенный реверсивный поиск (включая виртуальные "
+"пакеты)\n"
 
 #: ../urpmq:95
 #, c-format
@@ -3294,12 +3225,17 @@ msgstr "  -r             - показать версию и релиз с наз
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - следующий пакет содержит исходные коды (эквивалент --src)\n"
+msgstr ""
+"  -s             - следующий пакет содержит исходные коды (эквивалент --"
+"src)\n"
 
 #: ../urpmq:106
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -u             - удалить пакет, если уже установлена более новая версия\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - удалить пакет, если уже установлена более новая версия\n"
 
 #: ../urpmq:107
 #, c-format
@@ -3336,25 +3272,37 @@ msgstr "используйте  -l для вывода списка файлов
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "для источника «%s» отсутствует xml-info; только частичный результат для пакета %s"
+msgstr ""
+"для источника «%s» отсутствует xml-info; только частичный результат для "
+"пакета %s"
 
 #: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "для источника «%s» отсутствует xml-info; только частичный результат для пакетов %s"
+msgstr ""
+"для источника «%s» отсутствует xml-info; только частичный результат для "
+"пакетов %s"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "для источника «%s» отсутствует xml-info; невозможно возвратить результат для пакета %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"для источника «%s» отсутствует xml-info; невозможно возвратить результат для "
+"пакета %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "для источника «%s» отсутствует xml-info; невозможно возвратить результат для пакетов %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"для источника «%s» отсутствует xml-info; невозможно возвратить результат для "
+"пакетов %s"
 
 #: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "Не найден журнал изменений\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Обновляется источник...\n"
diff --git a/po/sc.po b/po/sc.po
index 34306ab0..4ea96bb7 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-09-07 15:57+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Aposentadura RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -55,7 +55,7 @@ msgstr ""
 "\n"
 "Ita bolis fai?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "Sigu?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -85,22 +85,22 @@ msgstr ""
 "\n"
 "Forsis preferis feti a du sarvai. Ita sçoberas?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Aposenta"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Sarva"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "A_nnudda"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Sçobera anca sarvai su file"
@@ -206,12 +206,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "nisçunu pakitu nominau %s"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Abeta..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Depis essi root"
@@ -242,42 +242,42 @@ msgstr ""
 "%s\n"
 "Sigu?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Atentu"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Andat"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (de ajorronai)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (de aposentai)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Sçoberu de is pakitus"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Dui bolit unu de is pakitus ki sighint:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "L_assa"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -288,14 +288,14 @@ msgstr ""
 "%s\n"
 "Sigu?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Po satisfai is dependèntzias, megu a aposentai su pakitu ki sighit (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -303,44 +303,51 @@ msgstr ""
 "Po satisfai is dependèntzias, megu a aposentai is %d pakitus ki sighint:\n"
 "%s\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d pakitus"
 msgstr[1] "%d pakitus"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no potzu lompi a is pakitus mitza, bessu"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Apariçu..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Aposentu su pakitu `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Intra su mèdiu nominau \"%s\" in su trastu [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Scarrigamentu de su pakitu `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...no agataus: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Fatu"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -351,28 +358,27 @@ msgstr ""
 "%s\n"
 "Forsis bolis ajorronai su database de urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Aposentadura faddia"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Pakitu(s) jai aposentau(s)"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Aposentadura acabada"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "srèxinu %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "torru a aberri urpmi"
@@ -446,58 +452,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "impreu unu ambienti indidau in %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "no potzu aberri su database rpm"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nòmini file rpm [%s] no bàlidu"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "agatu su file rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...agataus"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...no agataus: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no potzu lompi a su file rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "no potzu analisai \"%s\" in su file [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "no potzu assentai su file rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "faddina assentendi is pakitus localis"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Custa cosa no fait a da fai candu ses in modalidadi strinta"
@@ -537,22 +537,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -644,82 +644,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Còpia faddia"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "ca amancat %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "ca amancat %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "ca amancat %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "srèxinu %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...no agataus: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocollu disconnotu indidau po %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "no apu agatau webfetch, cuddus suportaus funt: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "no potzu mainjai su protocollu: %s"
@@ -739,12 +744,12 @@ msgstr "no apu agatau su pakitu %s"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "agatu is file rpm de su mèdiu \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -752,47 +757,47 @@ msgstr ""
 "fata sa transatzioni po aposentai in %s (srèxina=%d, aposenta=%d, ajorrona=%"
 "d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "no potzu creai sa transatzioni"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "no potzu strai su rpm de su pakitu delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "no potzu aposentai su pakitu %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "aposentu %s de %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...no agataus: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "srèxinu su pakitu %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "srèxinu su pakitu %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "aposentu %s de %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Atra sceda apitzus de su pakitu %s"
@@ -837,75 +842,80 @@ msgstr "Atentu"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Aposentadura faddia"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Aposentadura faddia"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Is pakitus ki sighint tenint firmas malas"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Is pakitus ki sighint tenint firmas malas"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Bolis sighiri a aposentai?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "aposentu %s de %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "seu distribuendi %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "aposentu %s de %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "aposentu %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Provu a aposentai sentza de controllai is dependèntzias? (y/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Provu a aposentai de manera finas prus forti (--force)? (y/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Fait a aposentai"
@@ -1109,7 +1119,7 @@ msgstr "còpia de [%s] faddia (est stranu ki unu file aici piticu)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "càrculu su md5sum de sa hdlist (o synthesis) agatada"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "còpia de [%s] faddia (su md5sum no cunsonat)"
@@ -1149,32 +1159,32 @@ msgstr "no apu agatau hdlist po su mèdiu \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "agatu sa hdlist (o synthesis) de \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "controllu sa crai pùbriga de \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...apu importau sa crai %s de sa crai pùbriga de \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no potzu importai sa crai pùbriga de \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "no apu agatau hdlist po su mèdiu \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "apu açuntu su mèdiu %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1189,94 +1199,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "liju is file rpm de [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Mi spraxit, sçoberu malu, torra a provai\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "Sçoberu de is pakitus"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Circa"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "burru su mèdiu \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1359,307 +1374,6 @@ msgstr "càrrigu %s"
 msgid "unmounting %s"
 msgstr "scàrrigu %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf versioni %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Custu est programa lìberu e fait a du spainai basçu is tèrminis de sa GNU "
-"GPL.\n"
-"\n"
-"impreu:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - amosta custa missada de ajudu.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - imprea unu ambienti indidau (unu arrelatadori normalli\n"
-"                   de fartas).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - no impreist is mèdius indidaus, pratzius de vìrgula.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - imprea un'atra root po aposentai is rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - òrdina is mèdius segundu is sutarrayas pratzias de "
-"vìrgula.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - imprea sa synthesis indidada in logu de su db de urpmi.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - imprea sa synthesis indidada in logu de su db de urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - no amostist arrayas ugualis.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - imprea feti mèdius de ajorronamentu.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - po ndi sciri de prus.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - innyora sa diferèntzia mannas/piticas in totu is "
-"pattern.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - innyora sa diferèntzia mannas/piticas in totu is "
-"pattern.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - apega su còixi perl ke perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - obradori binàriu AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - obradori binàriu OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unàriu NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  )              - parèntesi dereta po serrai unu grupu de espressadas.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  -g             - amosta is grupus cun su nòmini puru.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    predefiniu est %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - amosta su tag url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - amosta su tag buildhost: host de fraigadura.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "àpriga sa muda a su file de assètiu"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - amosta tag conflicts: totu su ki nci gherrat.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - amosta su tag description: descriidura.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - amosta su tag epoch: tempus.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - amosta feti is nòminis de is pakitus.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - allistra is file in su pakitu.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - amosta su tag group: grupu.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - amosta feti is nòminis de is pakitus.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - amosta feti is nòminis de is pakitus.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - amosta su tag obsoletes: totu is ki imbeçat.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr ""
-"  --packager     - amosta su tag packager: cuncordadori de su pakitu.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - amosta su tag provides: totu su ki donat.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - amosta su tag requires: totu su ki bolit.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - amosta su tag size: mesura.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - amosta su tag sourcerpm: rpm mitza.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - amosta su tag obsoletes: totu is ki imbeçat.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - amosta s'arresùmini.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - amosta su tag url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - po ndi sciri de prus.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - allistra is file in su pakitu.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - amosta sa versioni, arrelasçu e arkidetura cun su "
-"nòmini.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "no apu agatau hdlist po su mèdiu \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "apu fraigau sa hdlist synthesis po su mèdiu \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "scriu sa llist po su mèdiu \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1676,7 +1390,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nisçunu pakitu nominau %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Is pakitus ki sighint cuntenint %s: %s"
@@ -1686,47 +1400,47 @@ msgstr "Is pakitus ki sighint cuntenint %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Pakitu(s) jai aposentau(s)"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Pakitu(s) jai aposentau(s)"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Pakitu(s) jai aposentau(s)"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "ca amancat %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Pakitu(s) jai aposentau(s)"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "ca no est satisfatu %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "provu a sçoberai %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "po podi apoderai %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1735,7 +1449,7 @@ msgstr ""
 "Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1744,12 +1458,12 @@ msgstr ""
 "Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "po podi aposentai %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "ca gherrat cun %s"
@@ -1843,6 +1557,12 @@ msgstr ""
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - imprea un'atra root po srexinai is rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - imprea un'atra root po aposentai is rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1873,39 +1593,39 @@ msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - sçobera tpotu is pakitus ki cunsonant cun s'espressada.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Feti superuser podit srexinai pakitus"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pakitus disconnotus"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pakitu disconnotu"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "srexinai su pakitu %s at a arrogai su sistema"
 msgstr[1] "srexinai su pakitu %s at a arrogai su sistema"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nudda de srexinai"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nudda de srexinai"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1917,45 +1637,334 @@ msgstr[1] ""
 "Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
 "d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "pakitu disconnotu"
 msgstr[1] "pakitu disconnotu"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "srèxinu su pakitu %s"
 msgstr[1] "srèxinu su pakitu %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "pigu su mèdiu arremoviditzu ke \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Srexinadura faddia"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Srexinadura faddia"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf versioni %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Custu est programa lìberu e fait a du spainai basçu is tèrminis de sa GNU "
+"GPL.\n"
+"\n"
+"impreu:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - amosta custa missada de ajudu.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - imprea unu ambienti indidau (unu arrelatadori normalli\n"
+"                   de fartas).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - no impreist is mèdius indidaus, pratzius de vìrgula.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - òrdina is mèdius segundu is sutarrayas pratzias de "
+"vìrgula.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - imprea sa synthesis indidada in logu de su db de urpmi.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - imprea sa synthesis indidada in logu de su db de urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - no amostist arrayas ugualis.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - imprea feti mèdius de ajorronamentu.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - po ndi sciri de prus.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - innyora sa diferèntzia mannas/piticas in totu is "
+"pattern.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - innyora sa diferèntzia mannas/piticas in totu is "
+"pattern.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - apega su còixi perl ke perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - obradori binàriu AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - obradori binàriu OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unàriu NOT.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  )              - parèntesi dereta po serrai unu grupu de espressadas.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  -g             - amosta is grupus cun su nòmini puru.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    predefiniu est %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - amosta su tag url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - amosta su tag buildhost: host de fraigadura.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "àpriga sa muda a su file de assètiu"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - amosta tag conflicts: totu su ki nci gherrat.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - amosta su tag description: descriidura.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - amosta su tag epoch: tempus.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - amosta feti is nòminis de is pakitus.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - allistra is file in su pakitu.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - amosta su tag group: grupu.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - amosta feti is nòminis de is pakitus.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - amosta feti is nòminis de is pakitus.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - amosta su tag obsoletes: totu is ki imbeçat.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr ""
+"  --packager     - amosta su tag packager: cuncordadori de su pakitu.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - amosta su tag provides: totu su ki donat.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - amosta su tag requires: totu su ki bolit.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - amosta su tag size: mesura.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - amosta su tag sourcerpm: rpm mitza.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - amosta su tag obsoletes: totu is ki imbeçat.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - amosta s'arresùmini.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - amosta su tag url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - po ndi sciri de prus.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - allistra is file in su pakitu.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - amosta sa versioni, arrelasçu e arkidetura cun su "
+"nòmini.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "no apu agatau hdlist po su mèdiu \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "apu fraigau sa hdlist synthesis po su mèdiu \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "scriu sa llist po su mèdiu \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2300,36 +2309,31 @@ msgstr ""
 "Faddina: %s parit carrigau a ligi-feti.\n"
 "Impreu --allow-force po fortzai s'atzioni."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (de ajorronai)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (de ajorronai)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (de aposentai)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (de aposentai)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2338,12 +2342,12 @@ msgstr ""
 "Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
 "d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ita sçoberas? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2354,7 +2358,7 @@ msgstr ""
 "beçus de cuddus aposentaus:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2365,19 +2369,19 @@ msgstr ""
 "beçus de cuddus aposentaus:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Sigu comuncas?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2386,7 +2390,7 @@ msgstr ""
 "Cancu pakitu bòfiu no fait a d'aposentai:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2395,12 +2399,12 @@ msgstr ""
 "Cancu pakitu bòfiu no fait a d'aposentai:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "srexinai su pakitu %s at a arrogai su sistema"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2411,7 +2415,7 @@ msgstr ""
 "bolint srexinaus po ndi podi ajorronai atrus:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2422,12 +2426,12 @@ msgstr ""
 "bolint srexinaus po ndi podi ajorronai atrus:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2437,7 +2441,7 @@ msgstr ""
 "Depis essi root po aposentai is dependèntzias ki sighint:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2448,39 +2452,39 @@ msgstr[1] ""
 "Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
 "d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, fuzzy, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "No fait a aposentai is pakitus (%s)!"
 msgstr[1] "No fait a aposentai is pakitus (%s)!"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Annudda"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Craca Enter candu ses prontu..."
@@ -2921,12 +2925,12 @@ msgstr "  -f             - fortza sa fraigadura de is file hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Feti superuser podit ajorronai mèdius"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nudda de ajorronai (imprea urpmi.addmedia po açungi mèdius)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2935,17 +2939,17 @@ msgstr ""
 "amancat sa boxi de ajorronai\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "innyoru su mèdiu %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "abivu su mèdiu %s"
diff --git a/po/sk.po b/po/sk.po
index ca690b1d..9286cd36 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-09-07 16:34+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Inštalácia RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 "Čo si želáte spraviť?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -68,7 +68,7 @@ msgstr ""
 "\n"
 "Vykonať?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -83,22 +83,22 @@ msgstr ""
 "\n"
 "Mali by ste preferovať iba jeho uloženie. Aký je váš výber?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Inštalácia"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Vyberte umiestnenie pre uloženie súboru"
@@ -205,12 +205,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "žiaden balík s menom %s"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Čakajte prosím..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Sú vyžadované právomoci root-a"
@@ -241,42 +241,42 @@ msgstr ""
 "%s\n"
 "Pokračovať?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Varovanie"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (na aktualizáciu)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (na inštaláciu)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Výber balíka"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jeden z nasledujúcich balíkov je potrebný:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Zrušiť"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -287,7 +287,7 @@ msgstr ""
 "%s\n"
 "Pokračovať?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -295,7 +295,7 @@ msgstr ""
 "Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
 "d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -303,7 +303,7 @@ msgstr ""
 "Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
 "d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -311,37 +311,44 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nie je možné získať zdrojové balíky, prerušenie"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Príprava..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Inštalácia balíka `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Prosím vložte médium \"%s\" do zariadenia [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Získavanie balíka `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...získavanie zlyhalo: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Hotovo"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -352,28 +359,27 @@ msgstr ""
 "%s\n"
 "Možno budete chcieť aktualizovať Vašu urpmi databázu"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Inštalácia zlyhala"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Všetko je už nainštalované"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Inštalácia ukončená"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "odstraňovanie %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "znovuspustenie urpmi"
@@ -448,58 +454,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "použitie špecifického prostredia na %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "nemôžem otvoriť rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nesprávne meno rpm súboru [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "sťahovanie rpm súboru [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...získavanie ukončené"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...získavanie zlyhalo: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nie je možné pristúpiť k rpm súboru [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "nie je možné správne prečítať \"%s\" v súbore [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "nie je možné zaregistrovať rpm súbor"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "chyba pri registrácii lokálnych balíkov"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Táto operácia nie je povolená ak program beží v reštriktívnom režime"
@@ -539,22 +539,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -646,83 +646,88 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Kopírovanie zlyhalo"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "kvôli chýbajucemu %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "kvôli chýbajucemu %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "kvôli chýbajucemu %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "odstraňovanie %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...získavanie zlyhalo: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "neznámy protokol definovaný pre %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 "nebol nájdený žiaden balík poskytujúci webfetch, podporované sú tieto: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "neznámy protokol: %s"
@@ -742,12 +747,12 @@ msgstr "balík %s nebol nájdený."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "sťahovanie rpm súborov zo zdroja \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -755,47 +760,47 @@ msgstr ""
 "vytvorenie transakcie pre inštaláciu %s (odstrániť=%d, inštalovať=%d, "
 "aktualizácia=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "nie je možné vytvoriť transakciu"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "nie je možné rozbaliť rpm z balíka delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "nie je možné nainštalovať balík %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "inštalácia %s z %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...získavanie zlyhalo: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "odstraňovanie balíka %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "odstraňovanie balíka %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "inštalácia %s z %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Viac informácií o balíku %s"
@@ -840,75 +845,80 @@ msgstr "Varovanie"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Inštalácia zlyhala"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Inštalácia zlyhala"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Nasledujúce balíky obsahujú zle signatúry"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Nasledujúce balíky obsahujú zle signatúry"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Chcete pokračovať v inštalácii ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "inštalácia %s z %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuovanie %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "inštalácia %s z %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "inštalácia %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Skúsiť inštaláciu bez kontroly závislostí? (á/N) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Skúsiť \"tvrdšiu\" inštaláciu (--force)? (á/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Inštalácia je možná"
@@ -1117,7 +1127,7 @@ msgstr "kopírovanie [%s] zlyhalo (súbor je podozrivo malý)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "výpočet md5sum zo získaných súborov hdlist (alebo synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopírovanie [%s] zlyhalo zlyhalo (nesprávny md5sum)"
@@ -1157,32 +1167,32 @@ msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "získavanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "prehliada sa súbor s verejnými kľúčmi \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importuje sa kľúč %s zo súboru s verejnými kľúčmi \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nie je možné naimportovať súbor s verejnými kľúčmi \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "pridaný zdroj %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1197,94 +1207,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "čítanie rpm súborov z [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyAaÁá"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (á/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Prepáčte, zlá voľba, skúste znova\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "Výber balíka"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Vyhľadávanie"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "odstránenie zdroja \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1368,302 +1383,6 @@ msgstr "pripájanie %s"
 msgid "unmounting %s"
 msgstr "odpája sa %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf verzia %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Toto je slobodný softvér a môže byť redistribuovaný pod licenciou GNU GPL.\n"
-"použitie:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - zobraziť túto pomoc.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - použiť špecifické prostredie (typické pre oznámenie\n"
-"                   o chybe).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - nepoužívať zadané zdroje; viaceré je možné oddeliť "
-"čiarkou.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - zoradiť zdroje podľa kľúčov; viaceré je možné oddeliť\n"
-"                   čiarkou.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - nezobrazovať zhodné riadky.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - použiť iba aktualizačné zroje.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - zobraziť podrobnosti.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignorovať veľkosť písma vo vzore.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - ignorovať veľkosť písma vo vzore.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - vložiť perl kód priamo, podobne ako perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binárny AND operátor.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binárny OR operátor.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unárne NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - pravá zátvorka pre uzatvorenie skupiny výrazov.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Zoznam dát pre obnovu:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - použiť X rozhranie.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    implicitná je %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - zobraziť značku url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - zobraziť značku kompilovací hostiteľ: buildhost.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "aplikovať zmeny do konfiguračného súboru"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - zobraziť značku konflikty: conflicts.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - zobraziť značku popis: description.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - zobraziť značku epocha: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - zobraziť iba názvy balíkov.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - zoznam súborov v balíku.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - zobraziť značku skupina: group.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - zobraziť iba názvy balíkov.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - zobraziť iba názvy balíkov.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - zobraziť značku zastaralé: obsoletes.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - zobraziť značku autor balíka: packager.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - zobraziť značku poskytované: provides.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - zobraziť značku vyžadované: requires.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - zobraziť značku veľkosť: size.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - zobraziť značku zdrojové rpm: sourcerpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - zobraziť značku zastaralé: obsoletes.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - zobraziť značku sumár: summary.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - zobraziť značku url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - zobraziť podrobnosti.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - zoznam súborov v balíku.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - zobraziť verziu, vydanie a architektúru spolu s menom.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1680,7 +1399,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Žiaden balík s menom %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Nasledujúce balíky obsahujú %s: %s"
@@ -1690,47 +1409,47 @@ msgstr "Nasledujúce balíky obsahujú %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Všetko je už nainštalované"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Všetko je už nainštalované"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Všetko je už nainštalované"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "kvôli chýbajucemu %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Všetko je už nainštalované"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "kvôli neuspokojenému %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokus o povýšenie %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "pre zachovanie poradia %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1739,7 +1458,7 @@ msgstr ""
 "Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1748,12 +1467,12 @@ msgstr ""
 "Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "pre inštaláciu balíka %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "kvôli konfliktom s %s"
@@ -1847,6 +1566,13 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - použiť iný koreňový adresár pre odstránenie rpm balíkov.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1877,22 +1603,22 @@ msgstr "  --verbose      - zobraziť podrobnosti.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vybrať všetky balíky zodpovedajúce výrazu.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Iba superpoužívateľ môže odstraňovať balíky"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "neznáme balíky"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "neznámy balík"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1900,17 +1626,17 @@ msgstr[0] "odstránenie balíka %s zrejme poškodí váš systém"
 msgstr[1] "odstránenie balíka %s zrejme poškodí váš systém"
 msgstr[2] "odstránenie balíka %s zrejme poškodí váš systém"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nič na odstránenie"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nič na odstránenie"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1922,7 +1648,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1930,7 +1656,7 @@ msgstr[0] "neznámy balík"
 msgstr[1] "neznámy balík"
 msgstr[2] "neznámy balík"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1938,31 +1664,314 @@ msgstr[0] "odstraňovanie balíka %s"
 msgstr[1] "odstraňovanie balíka %s"
 msgstr[2] "odstraňovanie balíka %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (á/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "výber vymeniteľného zariadenia ako \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Odstránenie neskončilo úspechom"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Odstránenie neskončilo úspechom"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf verzia %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Toto je slobodný softvér a môže byť redistribuovaný pod licenciou GNU GPL.\n"
+"použitie:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - zobraziť túto pomoc.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - použiť špecifické prostredie (typické pre oznámenie\n"
+"                   o chybe).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - nepoužívať zadané zdroje; viaceré je možné oddeliť "
+"čiarkou.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - zoradiť zdroje podľa kľúčov; viaceré je možné oddeliť\n"
+"                   čiarkou.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - nezobrazovať zhodné riadky.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - použiť iba aktualizačné zroje.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - zobraziť podrobnosti.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignorovať veľkosť písma vo vzore.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - ignorovať veľkosť písma vo vzore.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - vložiť perl kód priamo, podobne ako perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binárny AND operátor.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binárny OR operátor.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unárne NOT.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - pravá zátvorka pre uzatvorenie skupiny výrazov.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Zoznam dát pre obnovu:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - použiť X rozhranie.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    implicitná je %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - zobraziť značku url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - zobraziť značku kompilovací hostiteľ: buildhost.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "aplikovať zmeny do konfiguračného súboru"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - zobraziť značku konflikty: conflicts.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - zobraziť značku popis: description.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - zobraziť značku epocha: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - zobraziť iba názvy balíkov.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - zoznam súborov v balíku.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - zobraziť značku skupina: group.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - zobraziť iba názvy balíkov.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - zobraziť iba názvy balíkov.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - zobraziť značku zastaralé: obsoletes.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - zobraziť značku autor balíka: packager.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - zobraziť značku poskytované: provides.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - zobraziť značku vyžadované: requires.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - zobraziť značku veľkosť: size.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - zobraziť značku zdrojové rpm: sourcerpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - zobraziť značku zastaralé: obsoletes.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - zobraziť značku sumár: summary.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - zobraziť značku url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - zobraziť podrobnosti.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - zoznam súborov v balíku.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - zobraziť verziu, vydanie a architektúru spolu s menom.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2315,36 +2324,31 @@ msgstr ""
 "Chyba: %s sa zdá byť pripojený iba pre čítanie.\n"
 "Použite --allow-force pre vnútenie tejto operácie."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (na aktualizáciu)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (na aktualizáciu)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (na inštaláciu)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (na inštaláciu)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2352,12 +2356,12 @@ msgid ""
 msgstr ""
 "Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Váš výber? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2369,7 +2373,7 @@ msgstr ""
 "ktoré sú staršie ako tie ktoré sú nainštalované:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2381,19 +2385,19 @@ msgstr ""
 "ktoré sú staršie ako tie ktoré sú nainštalované:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Pokračovať?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Á/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2402,7 +2406,7 @@ msgstr ""
 "Niektoré požadované balíky nie je možné nainštalovať:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2411,12 +2415,12 @@ msgstr ""
 "Niektoré požadované balíky nie je možné nainštalovať:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "odstránenie balíka %s zrejme poškodí váš systém"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2427,7 +2431,7 @@ msgstr ""
 "odstránené aby mohli byť iné aktualizované:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2438,12 +2442,12 @@ msgstr ""
 "odstránené aby mohli byť iné aktualizované:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2453,7 +2457,7 @@ msgstr ""
 "Musíte byť root ak chcete nainštalovať tieto aktualizácie:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2464,27 +2468,27 @@ msgstr[1] ""
 msgstr[2] ""
 "Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2492,12 +2496,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Stlačte Enter ak je možné pokračovať..."
@@ -2935,12 +2939,12 @@ msgstr "  -f             - vnúť generovanie hdlist súborov.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Iba superpoužívateľ môže aktualizovať médiá"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nie je čo aktualizovať (použiť urpmi.addmedia na pridanie zdroja)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2949,17 +2953,17 @@ msgstr ""
 "chýba názov média pre aktualizáciu\n"
 "(jeden z %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorovanie zdroja %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "povolenie zdroja %s"
diff --git a/po/sq.po b/po/sq.po
index e184c028..acb12715 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2002-12-04 23:55+0200\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Instalimi i sistemit"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -44,7 +44,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "Ju duhet të jeni administrator  për t'instaluar mvarësit e radhitura:\n"
 "%s\n"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -66,22 +66,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Instalo"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Ruaj"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Anulo"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, fuzzy, c-format
 msgid "Choose location to save file"
 msgstr "Zgjedhe një skedare"
@@ -186,12 +186,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Asnjë urdhër i specifikuar"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, fuzzy, c-format
 msgid "Please wait..."
 msgstr "Një moment ju lutemi."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Porta e Minit"
@@ -221,42 +221,42 @@ msgstr ""
 "Disa nga pakot e kërkuara nuk mund të instalohen:\n"
 "%s"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Kujdes"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Azhurno"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Fundi i instalimit"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Një nga pakot e radhitura nevojitet:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Ndërpreje"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -266,13 +266,13 @@ msgstr ""
 "Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
 "%s"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -281,44 +281,51 @@ msgstr ""
 "instalohen:\n"
 "\n"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "e pa mundur marrja e burimit të pakos, ndërpritje"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Përgatitje..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalimi i pakove `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Ju lutemi futni burimin e emruar \"%s\" në mjetin [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Shkarkimi i pakos `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...rikuperimi dështoi: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Përfundoi"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -329,28 +336,27 @@ msgstr ""
 "%s\n"
 "A dëshironi t'azhurnoni bazën e të dhënave urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalimi dështio"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Gjdo gjë është veçse e instaluar"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalimi përfundoi"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "zhdukja e %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -426,58 +432,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "përdorim specifik i mjedisit në %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "e pa mundur hapja e rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "emri i skedares rpm është invalid [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "rikuperimi i skedareve rpm [%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...rikuperim i bërë"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...rikuperimi dështoi: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "e pa mundur hyrja në skedaren rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "analizimi i pa mundur i \"%s\" në skedaren [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "i pa mundur regjistrimi i skedares rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "gabim gjatë regjistrimit të pakove lokale"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -517,22 +517,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -624,82 +624,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Kopjimi dështoi"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "ka arritur nga mungesa %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "ka arritur nga mungesa %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "ka arritur nga mungesa %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "zhdukja e %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...rikuperimi dështoi: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protokol i pa njoftur për përcaktimit e %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "i pa mundur përdorimi i protokolit: %s"
@@ -719,12 +724,12 @@ msgstr "pakoja %s nuk është prezente"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -732,47 +737,47 @@ msgstr ""
 "krijimi i një akcioni transmetues për një instalim në %s (remove=%d, install="
 "%d, upgrade=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "i pa mundur krijimi i një akcioni transmetues"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "e pa mundur zhdukja e pakos %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "i pa mundur instalimi i pakos %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "instalimi i %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...rikuperimi dështoi: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "zhdukja e pakos %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "zhdukja e pakos %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "instalimi i %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Më shumë informacione mbi pakon..."
@@ -817,75 +822,80 @@ msgstr "Kujdes"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalimi dështio"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Instalimi dështio"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "A dëshironi të vazhdoni me instalimin e tyre ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "instalimi i %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "shpërndarje e %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "instalimi i %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "instalimi i %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Tento një instalim pa verifikimin e mvarësive? (p/J) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Tento një instalim më të forcuar (--force)? (p/J) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalimi është i mundur"
@@ -1092,7 +1102,7 @@ msgstr "kopjimi i [%s] dështoi"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "llogaritja md5sum e rikuperimit të burimit hdlist (ose sintezës)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopjimi i [%s] dështoi"
@@ -1132,32 +1142,32 @@ msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "rikuperim i burimit hdlist (ose sintezës) të \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "verifimi i skedares pubkey të \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importimi i çelësit %s nga skedarja pubkey e \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "është e pa mundur importimi i skedares pubkey të \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "shtuarja e burimit %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1172,94 +1182,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "lexim i skedareve rpm nga [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (p/J)"
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Kemi ndjesë, zgjedhje e gabuar, provoni edhe një herë\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Hulumto"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "zhdukja e burimit \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1342,304 +1357,6 @@ msgstr "montimi i %s"
 msgid "unmounting %s"
 msgstr "demontimi i %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"azhurnimi-mdk versioni %s\n"
-"E drejtë autori (C) %s Mandriva.\n"
-"Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
-"\n"
-"përdorim:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - shtype këtë lajmë ndihmues.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - përdore mjedisin e veçantë (veçënarishtë një raport "
-"bugi).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia        - mos i përdor vetëm burimet e dhëna, të ndara me "
-"presje.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia        - radhitja e burimit akordohet me ndër-rreshtat e ndarë "
-"me presje.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - përdori skedaret e dhëna sintezë në vend të db.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - përdori skedaret e dhëna sintezë në vend të db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq          - mos i çfaqë rreshtat e njëjtë.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - përdori vetëm burimet azhurnuese.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - model oratori.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - injoroje rastin e ndryshëm në gjdo model.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - injoroje rastin e ndryshëm në gjdo model.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - përfshije kodin perl direkt sikur perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operues AND binar.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operues OR binar.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -!             - njëjsi NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  )             - kllapë e djathtë për ta mbyllur shprehjen e grupit.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Listoi të dhënat për ti riparuar:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - përdore sipërfaqën ndarëse X.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-"\n"
-"                      Raporti DrakBackup \n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url        - çfaqe etiketën serial: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - çfaqe etiketën buildhost: ndërtoje ftuesin.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Konfigurimi i modulit të Konsolës"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - çfaqe etiketën conflicts: gjitha konfliktet.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - çfaqe etiketën description: përshkrimi.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch          - çfaqe etiketën epoch: epokë.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --all           - çfaqi të gjitha etiketat.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --list         - shpalosi pakotë lira.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - çfaqe etiketën group: grupi.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --all           - çfaqi të gjitha etiketat.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --all           - çfaqi të gjitha etiketat.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager      - çfaqe etiketën packager: paketues.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - çfaqe etiketën provides: gjitha pajisjet.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - çfaqe etiketën requires: gjitha dëshiratë.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - çfaqe etiketën size: madhësia.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm     - çfaqe etiketën sourcerpm: burimi rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary        - çfaqe etiketën summary: përmbledhje.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url        - çfaqe etiketën serial: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - model oratori.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  --list         - shpalosi pakotë lira.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - çfaqe versionin, hollësitë dhe arkitekturen me emër.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "krijimi i skedares sintezë për burimin \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "shkruarja e skedares për listën e burimit \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1656,7 +1373,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Asnjë pako e emruar %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Pakot e radhitura përmbajnë %s: %s"
@@ -1666,47 +1383,47 @@ msgstr "Pakot e radhitura përmbajnë %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Gjdo gjë është veçse e instaluar"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Gjdo gjë është veçse e instaluar"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Gjdo gjë është veçse e instaluar"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "ka arritur nga mungesa %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Gjdo gjë është veçse e instaluar"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "ka arritur gjatë mosmarrëveshjes %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "tentim në gradimin e %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "në urdhër për ta mbajturë %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1715,7 +1432,7 @@ msgstr ""
 "Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1724,12 +1441,12 @@ msgstr ""
 "Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "në urdhër për instalim %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "ka arritur gjatë konflikteve me %s"
@@ -1824,6 +1541,13 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1851,39 +1575,39 @@ msgstr "  --verbose      - model oratori.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - zgjedhni të gjitha pakot me përshkrim të njëjtë.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pako të pa njoftura"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pako e pa njoftur"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
 msgstr[1] "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Mos zhduk asgjë"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Mos zhduk asgjë"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1891,45 +1615,330 @@ msgid_plural ""
 msgstr[0] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
 msgstr[1] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "pako e pa njoftur"
 msgstr[1] "pako e pa njoftur"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "zhdukja e pakos %s"
 msgstr[1] "zhdukja e pakos %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (p/J)"
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "marrje e mjetit tërheqës si \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Zhdukja dështoi"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Zhdukja dështoi"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"azhurnimi-mdk versioni %s\n"
+"E drejtë autori (C) %s Mandriva.\n"
+"Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
+"\n"
+"përdorim:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - shtype këtë lajmë ndihmues.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - përdore mjedisin e veçantë (veçënarishtë një raport "
+"bugi).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia        - mos i përdor vetëm burimet e dhëna, të ndara me "
+"presje.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia        - radhitja e burimit akordohet me ndër-rreshtat e ndarë "
+"me presje.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - përdori skedaret e dhëna sintezë në vend të db.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - përdori skedaret e dhëna sintezë në vend të db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq          - mos i çfaqë rreshtat e njëjtë.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - përdori vetëm burimet azhurnuese.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - model oratori.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - injoroje rastin e ndryshëm në gjdo model.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - injoroje rastin e ndryshëm në gjdo model.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - përfshije kodin perl direkt sikur perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operues AND binar.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operues OR binar.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -!             - njëjsi NOT.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  )             - kllapë e djathtë për ta mbyllur shprehjen e grupit.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Listoi të dhënat për ti riparuar:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - përdore sipërfaqën ndarëse X.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+"\n"
+"                      Raporti DrakBackup \n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url        - çfaqe etiketën serial: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - çfaqe etiketën buildhost: ndërtoje ftuesin.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Konfigurimi i modulit të Konsolës"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - çfaqe etiketën conflicts: gjitha konfliktet.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - çfaqe etiketën description: përshkrimi.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch          - çfaqe etiketën epoch: epokë.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --all           - çfaqi të gjitha etiketat.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --list         - shpalosi pakotë lira.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - çfaqe etiketën group: grupi.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --all           - çfaqi të gjitha etiketat.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --all           - çfaqi të gjitha etiketat.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager      - çfaqe etiketën packager: paketues.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - çfaqe etiketën provides: gjitha pajisjet.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - çfaqe etiketën requires: gjitha dëshiratë.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - çfaqe etiketën size: madhësia.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm     - çfaqe etiketën sourcerpm: burimi rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary        - çfaqe etiketën summary: përmbledhje.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url        - çfaqe etiketën serial: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - model oratori.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  --list         - shpalosi pakotë lira.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - çfaqe versionin, hollësitë dhe arkitekturen me emër.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "krijimi i skedares sintezë për burimin \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "shkruarja e skedares për listën e burimit \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2275,48 +2284,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Azhurno"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Azhurno"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Fundi i instalimit"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Fundi i instalimit"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Cila është zgedhja e juaj? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2324,7 +2328,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2332,19 +2336,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Vazhdo pa marrë parasyshë?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (P/j) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2353,7 +2357,7 @@ msgstr ""
 "Disa nga pakot e kërkuara nuk mund të instalohen:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2362,12 +2366,12 @@ msgstr ""
 "Disa nga pakot e kërkuara nuk mund të instalohen:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2378,7 +2382,7 @@ msgstr ""
 "të zhduken që të tjerat të azhurnohen:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2389,12 +2393,12 @@ msgstr ""
 "të zhduken që të tjerat të azhurnohen:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2404,46 +2408,46 @@ msgstr ""
 "Ju duhet të jeni administrator  për t'instaluar mvarësit e radhitura:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
 msgstr[1] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Anulo"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
@@ -2889,13 +2893,13 @@ msgstr "  -f             - përfitim i forcuar në skedaret hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "asgjë për tu azhurnuar (përdore urpmi.addmedia për të shtuar një burim)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2904,17 +2908,17 @@ msgstr ""
 "hyrja për azhurnim mungon\n"
 "(një nga %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Botimi i burimit \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "zhdukja e burimit \"%s\""
diff --git a/po/sr.po b/po/sr.po
index ef20fdba..6cd00761 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2004-02-01 19:27+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -25,22 +25,22 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Инсталација система"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_У реду"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -53,7 +53,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -65,7 +65,7 @@ msgstr ""
 "Морате да имате root овлашћења да би инсталирали следеће пакете:\n"
 "%s\n"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -75,22 +75,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "Инсталирај"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Поништи"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, fuzzy, c-format
 msgid "Choose location to save file"
 msgstr "Изаберите фајл"
@@ -193,12 +193,12 @@ msgstr "  --media        - користи само дати медиј, одво
 msgid "No packages specified"
 msgstr "Није одређена команда"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Молим сачекајте..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Порт за миша"
@@ -228,42 +228,42 @@ msgstr ""
 "Неки изабрани пакети се не могу инсталирати:\n"
 "%s"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "У реду"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Ажурирање"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Излаз из инсталације"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Потребан(и) су следећи пакет(и):"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Одустати"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -273,19 +273,19 @@ msgstr ""
 "Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
 "%s"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -293,37 +293,44 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "извор пакета није доступан, излазим..."
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Припремам..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталирам пакет `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Убаците медиј са именом %s у уређај [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Скидам пакет `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...повраћај неуспео: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Урађено"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -334,28 +341,27 @@ msgstr ""
 "%s\n"
 "Можда желите да ажурирате вашу urpmi базу података."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Инсталација није успела"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "све је већ инсталирано"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Инсталација готова"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "уклањам %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "рестартујем urpmi"
@@ -428,58 +434,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "користим дато окружење на %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "не могу да отворим rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "погрешно име rpm датотеке [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "добављам rpm фајл [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "... добављање завршено"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...повраћај неуспео: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "не могу да приступим rpm датотеци [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Не могу да парсирам \"%s\" у фајл [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "не могу да региструјем  rpm фајл"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "грешка при регистровању локалних пакета"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -519,22 +519,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -626,82 +626,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Копирање није успело"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "због не постојања %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "због не постојања %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "због не постојања %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "уклањам %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...повраћај неуспео: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "непознати протокол дефинисан за %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch није пронађен, подржани webfetch-ови су: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "не могу да подржим протокол: %s"
@@ -721,12 +726,12 @@ msgstr "пакет %s није пронађен."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -734,47 +739,47 @@ msgstr ""
 "креирана трансакција за инсталирање на  %s (уклони=%d, инсталирај=%d, "
 "ажурирај=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "не могу да креирам трансакцију"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "не могу да уклоним пакет %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "не могу да инсталирам пакет %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "Инсталирам %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...повраћај неуспео: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "уклањам пакет %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "уклањам пакет %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "Инсталирам %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Додатне информације о пакету..."
@@ -819,75 +824,80 @@ msgstr "Упозорење"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Инсталација није успела"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Инсталација није успела"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Следећи пакети имају неисправне потписе"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Следећи пакети имају неисправне потписе"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Да ли желите да наставите конфигурацију ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "Инсталирам %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "дистрибуирам %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "Инсталирам %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "Инсталирам %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Инсталиација без провере зависности (да/Не)? "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Присилна инсталација (--force)? (да/Не) ?"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Инсталација је могућа"
@@ -1092,7 +1102,7 @@ msgstr "копирање [%s] неуспело"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "прорачунавам md5sum копиране  source hdlist (или  synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "копирање [%s] неуспело"
@@ -1132,32 +1142,32 @@ msgstr "није пронађена hdlist датотека за медиј \"%s
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "добављам изорни hdlist (или synthesis) за \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "испитукем фајл са јавним кључем за \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "..импортовани кључ %s од јавног кључа за \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "не могу да импортујем јавни кључ за \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "није пронађена hdlist датотека за медиј \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "додани медиј %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1172,94 +1182,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "читам rpm фајлове са [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "НнNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ДдDdYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (д/Н) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Погрешан избор, пробајте поново\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Тражи"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "уклањам медиј \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1343,299 +1358,6 @@ msgstr "монтирам %s"
 msgid "unmounting %s"
 msgstr "демонтирам %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf верзија %s\n"
-"Copyright (C) 2002-2004 Mandriva.\n"
-"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
-"\n"
-"употреба:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - приказује овај екран о помоћи.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - користи специфично окружење (типично извештај о грешци).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - не користи дати медиј, одвојен зарезом.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --curl         - користи још један root за rpm инсталацију.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - сортира медије на основу подстрингова одвојених зарезом.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - не приказује идентичне линије.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - користи само update медиј.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - verbose режим.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - укључује перл код директно као perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - бинарни AND оператор.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - бинарни OR оператор.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - уинарни NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - десна заграда за затварање групе израза.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Листа података за обнављање:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - користи X интерфејс.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "  -l             - приказује фајлове у пакету.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - приказује таг url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - приказује таг buildhost: build host.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Модул за подешавање Konsole"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - приказује таг конфликата: сви конфликти.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - приказује таг описа: опис.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, fuzzy, c-format
-msgid "  --distribution - distribution\n"
-msgstr "Прикључак KAB-а за дистрибуционе листе"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --size          - приказује таг величине: величина.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --all           - приказује све тагове.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - приказује фајлове у пакету.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - приказује таг групе: група.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --all           - приказује све тагове.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --all           - приказује све тагове.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - приказује таг packager: packager.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - приказује таг обезбеђује: све обезбеђује.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - приказује таг захтева: сви захтеви\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - приказује таг величине: величина.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - приказује таг sourcerpm: source rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - приказује таг сажетка: сажетак.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - приказује таг url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -verbose       - verbose режим.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - приказује фајлове у пакету.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - приказује верзију, издање и архитектуру, укључујући и "
-"име.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "није пронађена hdlist датотека за медиј \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "уписујем листу фајлова за медиј \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1652,7 +1374,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Нема пакета са именом %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Следећи пакети садрже %s: %s"
@@ -1662,47 +1384,47 @@ msgstr "Следећи пакети садрже %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "све је већ инсталирано"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "све је већ инсталирано"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "све је већ инсталирано"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "због не постојања %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "све је већ инсталирано"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "због не задовољеног %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "покушавам да прикажем %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "да бих задржао %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1711,7 +1433,7 @@ msgstr ""
 "Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1720,12 +1442,12 @@ msgstr ""
 "Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "да би инсталирао %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "због конфликта са %s"
@@ -1817,6 +1539,12 @@ msgstr "  --packager     - приказује таг packager: packager.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --curl         - користи још један root за rpm инсталацију.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --curl         - користи још један root за rpm инсталацију.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1846,22 +1574,22 @@ msgstr "  -verbose       - verbose режим.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - изабери све пакете који одговарају изразу.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Само администратор може да инсталира пакете"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "непознати пакети"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "непознати пакет"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1869,17 +1597,17 @@ msgstr[0] "уклањање пакета %s ће нарушити Ваш сис�
 msgstr[1] "уклањање пакета %s ће нарушити Ваш систем"
 msgstr[2] "уклањање пакета %s ће нарушити Ваш систем"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Нема ничега што би се могло уклонити"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Нема ничега што би се могло уклонити"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1888,7 +1616,7 @@ msgstr[0] "Ради задовољења зависности, следећи п
 msgstr[1] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 msgstr[2] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1896,7 +1624,7 @@ msgstr[0] "непознати пакет"
 msgstr[1] "непознати пакет"
 msgstr[2] "непознати пакет"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1904,31 +1632,312 @@ msgstr[0] "уклањам пакет %s"
 msgstr[1] "уклањам пакет %s"
 msgstr[2] "уклањам пакет %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (д/Н) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "узимам преносни уређај као \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Уклањање није успело"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Уклањање није успело"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf верзија %s\n"
+"Copyright (C) 2002-2004 Mandriva.\n"
+"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
+"\n"
+"употреба:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - приказује овај екран о помоћи.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - користи специфично окружење (типично извештај о грешци).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - не користи дати медиј, одвојен зарезом.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - сортира медије на основу подстрингова одвојених зарезом.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - не приказује идентичне линије.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - користи само update медиј.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - verbose режим.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - укључује перл код директно као perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - бинарни AND оператор.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - бинарни OR оператор.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - уинарни NOT.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - десна заграда за затварање групе израза.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Листа података за обнављање:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - користи X интерфејс.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "  -l             - приказује фајлове у пакету.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - приказује таг url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - приказује таг buildhost: build host.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Модул за подешавање Konsole"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - приказује таг конфликата: сви конфликти.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - приказује таг описа: опис.\n"
+
+#: ../urpmf:67
+#, fuzzy, c-format
+msgid "  --distribution - distribution\n"
+msgstr "Прикључак KAB-а за дистрибуционе листе"
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --size          - приказује таг величине: величина.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --all           - приказује све тагове.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - приказује фајлове у пакету.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - приказује таг групе: група.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --all           - приказује све тагове.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --all           - приказује све тагове.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - приказује таг packager: packager.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - приказује таг обезбеђује: све обезбеђује.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - приказује таг захтева: сви захтеви\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - приказује таг величине: величина.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - приказује таг sourcerpm: source rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - приказује таг сажетка: сажетак.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - приказује таг url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -verbose       - verbose режим.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - приказује фајлове у пакету.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - приказује верзију, издање и архитектуру, укључујући и "
+"име.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "није пронађена hdlist датотека за медиј \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "уписујем листу фајлова за медиј \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2276,48 +2285,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Ажурирање"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Ажурирање"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Излаз из инсталације"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Излаз из инсталације"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Шта желите? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2325,7 +2329,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2333,19 +2337,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Свеједно наставити ?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Д/н) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2354,7 +2358,7 @@ msgstr ""
 "Неки изабрани пакети се не могу инсталирати:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2363,12 +2367,12 @@ msgstr ""
 "Неки изабрани пакети се не могу инсталирати:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "уклањање пакета %s ће нарушити Ваш систем"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2379,7 +2383,7 @@ msgstr ""
 "морају бити уклоњени да би остали могли да се ажурирају:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2390,12 +2394,12 @@ msgstr ""
 "морају бити уклоњени да би остали могли да се ажурирају:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2405,7 +2409,7 @@ msgstr ""
 "Морате да имате root овлашћења да би инсталирали следеће пакете:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2413,27 +2417,27 @@ msgstr[0] "Ради задовољења зависности, следећи п
 msgstr[1] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 msgstr[2] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2441,12 +2445,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Одустани"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Притисните enter када будете спремни..."
@@ -2885,12 +2889,12 @@ msgstr "  -f             - приморава на генерисање hdlist �
 msgid "Only superuser is allowed to update media"
 msgstr "Само администратор може да инсталира пакете"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нема ничега за ажурирање (користи urpmi.addmedia за додавање медија)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2899,17 +2903,17 @@ msgstr ""
 "недостаје унос за ажурирање\n"
 "(један од %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Мењам медиј \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "уклањам медиј \"%s\""
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 31122df6..3460c78d 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2004-02-01 19:27+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -25,22 +25,22 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Instalacija sistema"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_U redu"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -53,7 +53,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -65,7 +65,7 @@ msgstr ""
 "Morate da imate root ovlašćenja da bi instalirali sledeće pakete:\n"
 "%s\n"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -75,22 +75,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "Instaliraj"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Poništi"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, fuzzy, c-format
 msgid "Choose location to save file"
 msgstr "Izaberite fajl"
@@ -194,12 +194,12 @@ msgstr "  --media        - koristi samo dati medij, odvojen zarezom.\n"
 msgid "No packages specified"
 msgstr "Nije određena komanda"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Molim sačekajte..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Port za miša"
@@ -229,42 +229,42 @@ msgstr ""
 "Neki izabrani paketi se ne mogu instalirati:\n"
 "%s"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Ažuriranje"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Izlaz iz instalacije"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Potreban(i) su sledeći paket(i):"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Odustati"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -274,19 +274,19 @@ msgstr ""
 "Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
 "%s"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -294,37 +294,44 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "izvor paketa nije dostupan, izlazim..."
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Ubacite medij sa imenom %s u uređaj [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Skidam paket `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...povraćaj neuspeo: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Urađeno"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -335,28 +342,27 @@ msgstr ""
 "%s\n"
 "Možda želite da ažurirate vašu urpmi bazu podataka."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalacija nije uspela"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Instalacija gotova"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "uklanjam %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
@@ -429,58 +435,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "koristim dato okruženje na %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ne mogu da otvorim rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "pogrešno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dobavljam rpm fajl [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "... dobavljanje završeno"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...povraćaj neuspeo: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu da pristupim rpm datoteci [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Ne mogu da parsiram \"%s\" u fajl [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu da registrujem  rpm fajl"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "greška pri registrovanju lokalnih paketa"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -520,22 +520,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -627,82 +627,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Kopiranje nije uspelo"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "zbog ne postojanja %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "zbog ne postojanja %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "zbog ne postojanja %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "uklanjam %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...povraćaj neuspeo: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "nepoznati protokol definisan za %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch nije pronađen, podržani webfetch-ovi su: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ne mogu da podržim protokol: %s"
@@ -722,12 +727,12 @@ msgstr "paket %s nije pronađen."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -735,47 +740,47 @@ msgstr ""
 "kreirana transakcija za instaliranje na  %s (ukloni=%d, instaliraj=%d, "
 "ažuriraj=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "ne mogu da kreiram transakciju"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ne mogu da uklonim paket %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "ne mogu da instaliram paket %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "Instaliram %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...povraćaj neuspeo: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "uklanjam paket %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "uklanjam paket %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "Instaliram %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Dodatne informacije o paketu..."
@@ -820,75 +825,80 @@ msgstr "Upozorenje"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacija nije uspela"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Instalacija nije uspela"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Sledeći paketi imaju neispravne potpise"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sledeći paketi imaju neispravne potpise"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Da li želite da nastavite konfiguraciju ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "Instaliram %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuiram %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "Instaliram %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "Instaliram %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalacija je moguća"
@@ -1093,7 +1103,7 @@ msgstr "kopiranje [%s] neuspelo"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "proračunavam md5sum kopirane  source hdlist (ili  synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] neuspelo"
@@ -1133,32 +1143,32 @@ msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "ispitukem fajl sa javnim ključem za \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "..importovani ključ %s od javnog ključa za \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu da importujem javni ključ za \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "dodani medij %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1173,94 +1183,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "čitam rpm fajlove sa [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "NnNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "DdDdYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (d/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Pogrešan izbor, probajte ponovo\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Traži"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1344,300 +1359,6 @@ msgstr "montiram %s"
 msgid "unmounting %s"
 msgstr "demontiram %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf verzija %s\n"
-"Copyright (C) 2002-2004 Mandriva.\n"
-"Ovo je besplatan softver i može biti redistribuiran pod uslovima GNU GPL.\n"
-"\n"
-"upotreba:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - prikazuje ovaj ekran o pomoći.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - koristi specifično okruženje (tipično izveštaj o "
-"grešci).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ne koristi dati medij, odvojen zarezom.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --curl         - koristi još jedan root za rpm instalaciju.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortira medije na osnovu podstringova odvojenih zarezom.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ne prikazuje identične linije.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo update medij.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - verbose režim.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - uključuje perl kod direktno kao perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binarni AND operator.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binarni OR operator.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - uinarni NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - desna zagrada za zatvaranje grupe izraza.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Lista podataka za obnavljanje:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - koristi X interfejs.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "  -l             - prikazuje fajlove u paketu.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - prikazuje tag url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - prikazuje tag buildhost: build host.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Modul za podešavanje Konsole"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - prikazuje tag konflikata: svi konflikti.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - prikazuje tag opisa: opis.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, fuzzy, c-format
-msgid "  --distribution - distribution\n"
-msgstr "Priključak KAB-a za distribucione liste"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --size          - prikazuje tag veličine: veličina.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --all           - prikazuje sve tagove.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - prikazuje fajlove u paketu.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - prikazuje tag grupe: grupa.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --all           - prikazuje sve tagove.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --all           - prikazuje sve tagove.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - prikazuje tag packager: packager.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - prikazuje tag obezbeđuje: sve obezbeđuje.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - prikazuje tag zahteva: svi zahtevi\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - prikazuje tag veličine: veličina.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - prikazuje tag sourcerpm: source rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - prikazuje tag sažetka: sažetak.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - prikazuje tag url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -verbose       - verbose režim.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - prikazuje fajlove u paketu.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - prikazuje verziju, izdanje i arhitekturu, uključujući i "
-"ime.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "upisujem listu fajlova za medij \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1654,7 +1375,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nema paketa sa imenom %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sledeći paketi sadrže %s: %s"
@@ -1664,47 +1385,47 @@ msgstr "Sledeći paketi sadrže %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "zbog ne postojanja %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog ne zadovoljenog %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokušavam da prikažem %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "da bih zadržao %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1713,7 +1434,7 @@ msgstr ""
 "Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1722,12 +1443,12 @@ msgstr ""
 "Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "da bi instalirao %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zbog konflikta sa %s"
@@ -1819,6 +1540,12 @@ msgstr "  --packager     - prikazuje tag packager: packager.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --curl         - koristi još jedan root za rpm instalaciju.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --curl         - koristi još jedan root za rpm instalaciju.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1848,22 +1575,22 @@ msgstr "  -verbose       - verbose režim.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Samo administrator može da instalira pakete"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "nepoznati paketi"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "nepoznati paket"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1871,17 +1598,17 @@ msgstr[0] "uklanjanje paketa %s će narušiti Vaš sistem"
 msgstr[1] "uklanjanje paketa %s će narušiti Vaš sistem"
 msgstr[2] "uklanjanje paketa %s će narušiti Vaš sistem"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nema ničega što bi se moglo ukloniti"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nema ničega što bi se moglo ukloniti"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1893,7 +1620,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1901,7 +1628,7 @@ msgstr[0] "nepoznati paket"
 msgstr[1] "nepoznati paket"
 msgstr[2] "nepoznati paket"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1909,31 +1636,313 @@ msgstr[0] "uklanjam paket %s"
 msgstr[1] "uklanjam paket %s"
 msgstr[2] "uklanjam paket %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (d/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "uzimam prenosni uređaj kao \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Uklanjanje nije uspelo"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Uklanjanje nije uspelo"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf verzija %s\n"
+"Copyright (C) 2002-2004 Mandriva.\n"
+"Ovo je besplatan softver i može biti redistribuiran pod uslovima GNU GPL.\n"
+"\n"
+"upotreba:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - prikazuje ovaj ekran o pomoći.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - koristi specifično okruženje (tipično izveštaj o "
+"grešci).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - ne koristi dati medij, odvojen zarezom.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sortira medije na osnovu podstringova odvojenih zarezom.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ne prikazuje identične linije.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo update medij.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - verbose režim.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - uključuje perl kod direktno kao perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binarni AND operator.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binarni OR operator.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - uinarni NOT.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - desna zagrada za zatvaranje grupe izraza.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Lista podataka za obnavljanje:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - koristi X interfejs.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "  -l             - prikazuje fajlove u paketu.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - prikazuje tag url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - prikazuje tag buildhost: build host.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Modul za podešavanje Konsole"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - prikazuje tag konflikata: svi konflikti.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - prikazuje tag opisa: opis.\n"
+
+#: ../urpmf:67
+#, fuzzy, c-format
+msgid "  --distribution - distribution\n"
+msgstr "Priključak KAB-a za distribucione liste"
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --size          - prikazuje tag veličine: veličina.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --all           - prikazuje sve tagove.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - prikazuje fajlove u paketu.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - prikazuje tag grupe: grupa.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --all           - prikazuje sve tagove.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --all           - prikazuje sve tagove.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - prikazuje tag packager: packager.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - prikazuje tag obezbeđuje: sve obezbeđuje.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - prikazuje tag zahteva: svi zahtevi\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - prikazuje tag veličine: veličina.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - prikazuje tag sourcerpm: source rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - prikazuje tag sažetka: sažetak.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - prikazuje tag url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -verbose       - verbose režim.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - prikazuje fajlove u paketu.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - prikazuje verziju, izdanje i arhitekturu, uključujući i "
+"ime.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "upisujem listu fajlova za medij \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2281,48 +2290,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Ažuriranje"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Ažuriranje"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Izlaz iz instalacije"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Izlaz iz instalacije"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Šta želite? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2330,7 +2334,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2338,19 +2342,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Svejedno nastaviti ?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2359,7 +2363,7 @@ msgstr ""
 "Neki izabrani paketi se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2368,12 +2372,12 @@ msgstr ""
 "Neki izabrani paketi se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će narušiti Vaš sistem"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2384,7 +2388,7 @@ msgstr ""
 "moraju biti uklonjeni da bi ostali mogli da se ažuriraju:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2395,12 +2399,12 @@ msgstr ""
 "moraju biti uklonjeni da bi ostali mogli da se ažuriraju:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2410,7 +2414,7 @@ msgstr ""
 "Morate da imate root ovlašćenja da bi instalirali sledeće pakete:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2421,27 +2425,27 @@ msgstr[1] ""
 msgstr[2] ""
 "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2449,12 +2453,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pritisnite enter kada budete spremni..."
@@ -2893,13 +2897,13 @@ msgstr "  -f             - primorava na generisanje hdlist fajlova.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Samo administrator može da instalira pakete"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nema ničega za ažuriranje (koristi urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2908,17 +2912,17 @@ msgstr ""
 "nedostaje unos za ažuriranje\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Menjam medij \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "uklanjam medij \"%s\""
diff --git a/po/sv.po b/po/sv.po
index b24020ef..84b9787e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-09-21 19:25+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -29,22 +29,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM installation"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fel: kan inte hitta filen %s, avbryter operationen"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "Vad vill du göra?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -80,7 +80,7 @@ msgstr ""
 "\n"
 "Fortsätta?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -95,22 +95,22 @@ msgstr ""
 "\n"
 "Kanske föredrar du att endast spara detta. Vilket är ditt val?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Installera"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "Av_bryt"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Välj var filen ska sparas"
@@ -214,12 +214,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Inga paket specifierade"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Var god vänta..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Måste vara root"
@@ -250,42 +250,42 @@ msgstr ""
 "%s\n"
 "Vill du fortsätta ändå?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Varning"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (för att uppdatera)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (för att installera)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Val av paket"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ett av följande paket är nödvändigt:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Avbryt"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -296,58 +296,65 @@ msgstr ""
 "%s\n"
 "Vill du fortsätta ändå?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "För att tillfredsställa beroenden, kommer följande paket att installeras:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "För att tillfredsställa beroenden kommer följande paket att installeras:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paket, %d MB)"
 msgstr[1] "(%d paket, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kunde inte läsa källan, avbryter"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Förbereder..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerar paket \"%s\" (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Lägg i media med namnet \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laddar ner paket \"%s\"..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...hämtning misslyckades: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Klar"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -358,28 +365,27 @@ msgstr ""
 "%s\n"
 "Du bör försöka uppdatera urpmi-databasen."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Installationen misslyckades:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Allt är redan installerat"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Installation slutförd"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "tar bort %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "startar om urpmi"
@@ -453,58 +459,52 @@ msgstr "Omgivning sökväg %s existerar inte"
 msgid "using specific environment on %s\n"
 msgstr "använder specifik miljö på %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "kunde inte öppna RPM-db"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ogiltigt RPM-filnamn [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "hämtar RPM-fil [%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...hämtning klar"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...hämtning misslyckades: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kan inte läsa rpm-fil [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "kan inte tyda spec-fil %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "kan inte registrera RPM-fil"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Inkompatibel arkitektur för rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "fel vid registrering av lokala paket"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Denna operation är inte tillåten i begränsat läge"
@@ -546,22 +546,22 @@ msgstr ""
 "som standard väntar urpmf på en regexp. du borde använda alternativet \"--"
 "literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot katalog existerar inte"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan inte använda %s utan %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan inte använda %s med %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "För många argument\n"
@@ -657,82 +657,87 @@ msgstr "%s misslyckades: avlutades med signal %d"
 msgid "%s failed: exited with %d"
 msgstr "%s misslyckades: avlutades med %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "kopiering misslyckades"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget saknas\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl saknas\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl misslyckades: nerladdningen avbröts\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync saknas\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh saknas\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla saknas\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Kunde inte starta prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 saknas\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% av %s klar, ETA = %s, hastighet = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% klar, hastighet = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "hämtar %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "hämtade %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "okänt protokoll definierat för %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "ingen 'webfetch' hittad, supportad webfetch är: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "kan inte hantera protokoll: %s"
@@ -752,12 +757,12 @@ msgstr "paketet %s hittas inte."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "hämtar RPM-filer från media \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[ompaketering]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -765,47 +770,47 @@ msgstr ""
 "skapade transaktion för installation på %s (ta bort=%d, installera=%d, "
 "uppdatera=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "kunde inte skapa transaktion"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "kan inte extrahera rpm från delta-rpm paket %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "kan inte installera paket %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "tar bort felaktig rpm (%s) från %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "borttagning av %s misslyckades: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Tar bort paket %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "tar bort paket %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tar bort installerade rpms (%s) från %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Mer information om paket %s"
@@ -850,18 +855,23 @@ msgstr "avbryter"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s databas är låst (ett annat program använder den redan)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Installationen misslyckades"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Försök fortsätta ändå? (j/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -870,57 +880,57 @@ msgstr ""
 "Installationen misslyckades, felaktiga rpm:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Följande paket har felaktig signatur"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Följande paket har felaktiga signaturer"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Vill du fortsätta installationen?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "tar bort installerade rpms (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "distribuerar %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "installerar %s från %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "installerar %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Försök ännu hårdare att installera (--force)? (j/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paket är uppdaterade"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Installation är möjlig"
@@ -1124,7 +1134,7 @@ msgstr "kopiering av [%s] misslyckades (filen är misstänkligt liten)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "beräknar MD5-summa för hämtade syntheses källor"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "hämtning av [%s] misslyckades (md5sum stämmer inte)"
@@ -1164,32 +1174,32 @@ msgstr "ingen synthesis-fil hittad för media \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "hämtar käll-synthesis för \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "undersöker \"pubkey\"-fil för \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importerarde nyckel %s från \"pubkey\"-fil av \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kunde inte importera \"pubkey\"-fil för \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ingen synthesis-fil hittad för media \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uppdaterade media %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "hämtning av [%s] misslyckades"
@@ -1204,94 +1214,99 @@ msgstr "försöker igen med spegelserver %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Kunde inte hitta någon spegelserver från spegel-lista %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "hittade geolokalisering %s %.2f %.2f från tidszon %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "hämtar spegel-lista från %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Felaktigt val, försök igen.\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Paket"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Version"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Release"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arkitektur"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(föreslagen)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "media \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "kommandorad"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1380,298 +1395,6 @@ msgstr "monterar %s"
 msgid "unmounting %s"
 msgstr "avmonterar %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
-"\n"
-"användning:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - visa detta verktygs versionsnummer.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - använd specifik miljö (vanligen en felrapport).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - använd inte givet media, separerat med komma.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - sök inte mönster, använd argument som söksträng.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - använd en annan rot för db & rpm installation.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sorterar media enligt kommaseparerade delsträngar.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - använd angiven sökväg för att nå media\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - använd given synthesis istället för urpmi db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - visa inte identiska rader.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - använd endast uppdateringsmedia.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose             - utförligt läge.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - versaler och gemener jämförs lika i varje mönster.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - versaler och gemener jämförs olika i varje mönster.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - ändra fältavgränsare (standard ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Mönster-uttryck:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - vilken text som helst används för att söka, om inte -l är "
-"använt.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inkludera perl-kod direkt som perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binär AND operator.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binär OR operator.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unär NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - vänster och höger parentes.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Lista på taggar:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - använd printf-likt visningsformat\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   exempel: '%%namn:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arkitektur\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - kompileringsmaskin\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - kompilerigstid\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - konfigurationsfiler\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - visa konflikter\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - visa paketbeskrivning\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - visa distribution\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - visa epok\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - paketets filnamn\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - lista filer i paketet\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - visa grupp\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licens\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - visa paketnamn\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - visa ersätter\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - visa paketerare\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - visa tillhandahålls\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - visa krav\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - visa installerad storlek\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - visa källrpm-namn\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - suggests tag\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - visa summerig\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - visa url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - visa distributör\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - visa källan paketet finns i\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - visa version, utgåva och arkitektur med namn.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Felaktigt format: du kan endast använda en flervals-tagg"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "ingen hdlist-fil tillgänglig för media \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "ingen synthesis-fil tillgänglig för media \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "ingen xml-info tillgänglig för media \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1689,7 +1412,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Inget paket med namn %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Följande paket innehåller %s: %s"
@@ -1699,47 +1422,47 @@ msgstr "Följande paket innehåller %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Du borde använda \"-a\" för att använda alla av dem"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Hittade paket(en) %s i urpmi db, men inget är installerat"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Paket %s är redan installerat"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketen %s är redan installerade"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "för att %s saknas"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "på grund av redan installerad %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "på grund av otillräckliga %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "försöker befordra %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "för att behålla %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1748,7 +1471,7 @@ msgstr ""
 "Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1757,12 +1480,12 @@ msgstr ""
 "Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "för att installera %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "på grund av konflikter med %s"
@@ -1853,6 +1576,12 @@ msgstr "  --repackage    - ompaketera filerna före avinstallation\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - använd en annan root för att ta bort rpm .\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - använd en annan rot för db & rpm installation.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1883,39 +1612,39 @@ msgstr "  --verbose, -v  - utförligt läge.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - välj alla paket som matchar uttryck.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Endast systemadministratör får ta bort paket"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "okända paket"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "okänt paket"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Borttagning av följande paket skulle förstöra systemet:"
 msgstr[1] "Borttagning av följande paket skulle förstöra systemet:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting att ta bort"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Inga obehövliga paket att ta bort"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1925,45 +1654,325 @@ msgstr[0] ""
 msgstr[1] ""
 "För att tillfredsställa beroenden kommer följande %d paket att tas bort"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(obehövligt paket)(obehövligt paket)"
 msgstr[1] "(obehövliga paket)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Ta bort %d paket?"
 msgstr[1] "Ta bort %d paket?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "testar borttagning av %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Borttagning misslyckades"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Borttagning är möjlig"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
+"\n"
+"användning:\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - visa detta verktygs versionsnummer.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - använd specifik miljö (vanligen en felrapport).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - använd inte givet media, separerat med komma.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr "  --literal, -l  - sök inte mönster, använd argument som söksträng.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sorterar media enligt kommaseparerade delsträngar.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - använd angiven sökväg för att nå media\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - använd given synthesis istället för urpmi db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - visa inte identiska rader.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - använd endast uppdateringsmedia.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose             - utförligt läge.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - versaler och gemener jämförs lika i varje mönster.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - versaler och gemener jämförs olika i varje mönster.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - ändra fältavgränsare (standard ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Mönster-uttryck:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - vilken text som helst används för att söka, om inte -l är "
+"använt.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inkludera perl-kod direkt som perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binär AND operator.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binär OR operator.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unär NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - vänster och höger parentes.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Lista på taggar:\n"
+"\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - använd printf-likt visningsformat\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   exempel: '%%namn:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arkitektur\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - kompileringsmaskin\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - kompilerigstid\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - konfigurationsfiler\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - visa konflikter\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - visa paketbeskrivning\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - visa distribution\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - visa epok\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - paketets filnamn\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - lista filer i paketet\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - visa grupp\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licens\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - visa paketnamn\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - visa ersätter\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - visa paketerare\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - visa tillhandahålls\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - visa krav\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - visa installerad storlek\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - visa källrpm-namn\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - suggests tag\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - visa summerig\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - visa url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - visa distributör\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - visa källan paketet finns i\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - visa version, utgåva och arkitektur med namn.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "ej avslutat mönster-uttryck (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Felaktigt format: du kan endast använda en flervals-tagg"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "ingen hdlist-fil tillgänglig för media \"%s\""
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "ingen synthesis-fil tillgänglig för media \"%s\""
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "ingen xml-info tillgänglig för media \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2316,48 +2325,43 @@ msgstr ""
 "Fel: %s verkar vara monterad som read-only.\n"
 "Använd --allow-force för att tvinga operationen."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Uppdaterar media...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (för att uppdatera)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (för att uppdatera)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (för att installera)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (för att installera)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "För att tillfredsställa beroendet '%s', ett av följande paket behövs:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Vad är ditt val? ( 1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2368,7 +2372,7 @@ msgstr ""
 "är äldre än de installerade paketen:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2379,7 +2383,7 @@ msgstr ""
 "är äldre än de installerade paketen:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2388,12 +2392,12 @@ msgstr ""
 "\n"
 "Fortsätt installation ändå?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2402,7 +2406,7 @@ msgstr ""
 "Ett begärt paket kan inte installeras:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2411,12 +2415,12 @@ msgstr ""
 "Vissa begärda paket kan inte installeras:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "att ta bort paketet %s skulle förstöra systemet"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2427,7 +2431,7 @@ msgstr ""
 "tas bort så att andra kan uppdateras:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2438,12 +2442,12 @@ msgstr ""
 "tas bort så att andra kan uppdateras:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(endast test, ingenting kommer att bli borttaget)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2454,46 +2458,46 @@ msgstr ""
 "beroenden:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Följande obehövliga paket kommer att tas bort."
 msgstr[1] "Följande obehövliga paket kommer att tas bort."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(endast test, installation kommer inte att utföras)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s mera disk-utrymme kommer att bli använt."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s disk-utrymme kommer att frigöras."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s paket kommer att hämtas."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Fortsätt installationen ett paket?"
 msgstr[1] "Fortsätt installationen av %d paket?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tryck Enter när klart..."
@@ -2949,12 +2953,12 @@ msgstr "  -ff            - hård-tvinga uppdatering av synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Endast systemadministratör får uppdatera media"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "inget att uppdatera (använd urpmi.addmedia för att lägga till media)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2963,17 +2967,17 @@ msgstr ""
 "objektet som ska uppdateras saknas\n"
 "(en av %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorerar media %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "aktiverar media %s"
@@ -3255,6 +3259,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Ingen ändringslogg hittades\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Uppdaterar media...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "undersöker %s fil"
 
diff --git a/po/tg.po b/po/tg.po
index 2ad7561a..84111a70 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-09-17 16:34+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -25,22 +25,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Коргузориши RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ок"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, fuzzy, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "Шумо чи кор кардан мехоҳед?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "Шумо онро танҳо захира карда метавонед. Интихоби шумо чӣ гуна аст?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -94,22 +94,22 @@ msgstr ""
 "\n"
 "Шумо онро танҳо захира карда метавонед. Интихоби шумо чӣ гуна аст?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Коргузорӣ"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Нигоҳ доштан"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Бекор кардан"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Барои захиракунии файл ҷойгиршавиро интихоб кунед"
@@ -219,12 +219,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "қуттии бо номи %s нест"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Интизор бошед..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Даргоҳи муш"
@@ -254,42 +254,42 @@ msgstr ""
 "Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
 "%s"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Огоҳӣ"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Афзоиш"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Коргузорӣ ба итмом расид"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Яке аз қуттиҳои зерин даркор аст:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Қатъ кардан"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -300,58 +300,65 @@ msgstr ""
 "%s\n"
 "Шумо розӣ ҳастед?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Барои қаноатмандии тобеиятҳо бастаҳои зерин кор гузошта мешаванд (%d Мб)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Барои қаноатмандии тобеиятҳо бастаҳои %d зерин кор гузошта мешаванд (%d МБ)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Тайёрӣ..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ мешавад..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Фаровири қуттии `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...барқароркунӣ нагузашт: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Шуд"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -362,28 +369,27 @@ msgstr ""
 "%s\n"
 "Мумкин шумо додаҳои urpmi-ро нав мекунед"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Коргузорӣ нагузашт"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Ҳамааш аллакай кор гузошта шудааст"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Коргузориш шуд"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "хориҷи қуттии %s "
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi бозоғоз шуда истодааст"
@@ -457,58 +463,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "барои %s давраи махсус истифода мегардад\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "кушодани rpmdb номумкин"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "номи файли rpm-и нодурусти [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "барқароркунии файли rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...барқароркунӣ шуд"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...барқароркунӣ нагузашт: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "дохилшавии файли rpm-и [%s] номумкин"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "таҷзияи \"%s\" дар файли [%s] номумкин"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "бақайдгирии файли rpm номумкин"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -548,22 +548,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -655,82 +655,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Нусхабардорӣ нагузашт"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "аз сабаби мавҷуд набудан %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "аз сабаби мавҷуд набудан %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "аз сабаби мавҷуд набудан %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "хориҷи қуттии %s "
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...барқароркунӣ нагузашт: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "барои %s протоколи номуаяйн муқаррар шудааст"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch пайдо нагардид, webfetch пуштибонӣ мегардад: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "даста кардани қарордод номумкин: %s"
@@ -750,58 +755,58 @@ msgstr "қуттии %s ёфт нашуд."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "барқароркунии файли rpm аз миёна \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "тарокуниш барои коргузорӣ дар %s (remove=%d, install=%d, upgrade=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "офаридани муҳит номумкин аст"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "хориҷи қуттии %s номумкин"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "кор гузоштани қуттии %s номумкин"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "коргузории %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...барқароркунӣ нагузашт: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "хориҷкунии қуттии %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "хориҷкунии қуттии %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "коргузории %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Ахбороти изофагӣ дар бастаи %s"
@@ -846,75 +851,80 @@ msgstr "Огоҳӣ"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Коргузорӣ нагузашт"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Коргузорӣ нагузашт"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Қуттиҳои зерин имзоҳои бад доранд"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Қуттиҳои зерин имзоҳои бад доранд"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Шумо хоҳиши давом додани коргузориро доред ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "коргузории %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "тақсимкунии %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "коргузории %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "коргузории %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н)  "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Коргузорӣ мумкин аст"
@@ -1121,7 +1131,7 @@ msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 "аз hdlist-и аввалаи гирифташуда md5sum ҳисоб карда мешавад(ё ин ки synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "нусхабардории [%s] бо нокомӣ анҷомид (ба md5sum мутобиқат намекунад)"
@@ -1161,32 +1171,32 @@ msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "барқароркунии сарчашмаи hdlist (ё synthesis) \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "барои \"%s\"файли калиди кушод тафтиш карда мешавад..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...калиди гирифта шуда %s  аз файли калиди кушода \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "миёнаи иловашуда %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1201,94 +1211,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "хониши файлҳои rpm аз [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "НнNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ҲҳYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (ҳ/Н) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Ҷустуҷӯ"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "хориҷкунии миёнаи \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1371,308 +1386,6 @@ msgstr "васлкунии %s"
 msgid "unmounting %s"
 msgstr "ҷудокунии %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"нусхаи urpmf %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
-"шавад.\n"
-"\n"
-"истифода:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - муҳити махсусро истифода баред (одатан ҳисоботи "
-"хатогиҳо).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-" --excludemedia - сарчашмаҳое ки бо вергул ҷудо шудаанд, истифода набаред.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - дигар решаро барои коргузории rpm истифода баред.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - аз рӯи сатрҳое ки бо вергул ҷудо шудааст сарчашмаҳоро "
-"банавъҳо ҷудо намоед.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - synthesis -и додашударо ба ивази urpmi db истифода "
-"намоед.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - synthesis -и додашударо ба ивази urpmi db истифода "
-"намоед.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - хати рости монандро чоп накунед.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - танҳо муҳити навкунӣ истифода баред.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - ҳолати муфассал.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - дарбаргирии рамзи perl бевосита ҳамчун perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - амалгари дучанда AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -a             - амалгари дучанда AND.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - ягонӣ НЕ.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - қавси рост барои пӯшидани ифодаи гурӯҳ.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Рӯйхати додаҳо барои барқарор намудан:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - интерфейси X истифода баред.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    бо нобаёнӣ %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - чоп намоед тэг url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - tag buildhost: build host -ро чоп намоед.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Модули танзимоти Konsole"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - чопи тасвироти тэг: тасвирот.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - чопи epoch тэг: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - барориш рӯйхати файлҳои баста.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - чопи гурӯҳи тэг: гурӯҳ.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-"  --obsoletes    - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-"  --provides     - тэг provides-ро чоп намоед: ҳамаи файлҳои "
-"пешниҳодшаванда.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     -  тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - чопи ҳаҷми тэг: ҳаҷм.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - тэг sourcerpm-ро чоп намоед: rpm-и аввала.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-"  --obsoletes    - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - чопи ҷамъбасти тэг: ҷамъбаст.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - чоп намоед тэг url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - ҳолати муфассал.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - барориш рӯйхати файлҳои баста.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - тафсир, релиз ва архитектураро бо номҳояшон чоп намоед.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1689,7 +1402,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Қуттии бо номи %s нест"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Қуттиҳои зерин соҳиби %s: %s"
@@ -1699,47 +1412,47 @@ msgstr "Қуттиҳои зерин соҳиби %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Ҳамааш аллакай кор гузошта шудааст"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Ҳамааш аллакай кор гузошта шудааст"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Ҳамааш аллакай кор гузошта шудааст"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "аз сабаби мавҷуд набудан %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Ҳамааш аллакай кор гузошта шудааст"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "аз сабаби қонеъ набудан %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "кӯшиши фаъол намудан %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "барои нигоҳдории %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1749,7 +1462,7 @@ msgstr ""
 "%s\n"
 "Шумо розӣ ҳастед?"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1759,12 +1472,12 @@ msgstr ""
 "%s\n"
 "Шумо розӣ ҳастед?"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "барои коргузоштани %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "аз ҳисоби ба вуҷуд омадани муаммо бо %s"
@@ -1860,6 +1573,12 @@ msgstr "  --packager     - тэг packager-ро чоп намоед: қуттӣ
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - дигар решаро барои коргузории rpm истифода баред.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - дигар решаро барои коргузории rpm истифода баред.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1890,22 +1609,22 @@ msgstr "  --verbose      - ҳолати муфассал.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - интихоби ҳамаи қуттиҳои бо ифода мувофиқ буда.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Танҳо фавқулкорванд барои хориҷкунии муҳит рухсат дорад"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "қуттиҳои номаълум"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "қуттии номаълум"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1914,17 +1633,17 @@ msgstr[0] ""
 msgstr[1] ""
 "хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ҳеҷ чизро хориҷ карда намешавад"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Ҳеҷ чизро хориҷ карда намешавад"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1934,45 +1653,335 @@ msgstr[0] ""
 msgstr[1] ""
 "Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "қуттии номаълум"
 msgstr[1] "қуттии номаълум"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "хориҷкунии қуттии %s"
 msgstr[1] "хориҷкунии қуттии %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (ҳ/Н) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "қабули дастгоҳи хориҷшаванда ҳамчун \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Хориҷкунӣ нагузашт"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Хориҷкунӣ нагузашт"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"нусхаи urpmf %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
+"шавад.\n"
+"\n"
+"истифода:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - муҳити махсусро истифода баред (одатан ҳисоботи "
+"хатогиҳо).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+" --excludemedia - сарчашмаҳое ки бо вергул ҷудо шудаанд, истифода набаред.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - аз рӯи сатрҳое ки бо вергул ҷудо шудааст сарчашмаҳоро "
+"банавъҳо ҷудо намоед.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - synthesis -и додашударо ба ивази urpmi db истифода "
+"намоед.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - synthesis -и додашударо ба ивази urpmi db истифода "
+"намоед.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - хати рости монандро чоп накунед.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - танҳо муҳити навкунӣ истифода баред.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - ҳолати муфассал.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - дарбаргирии рамзи perl бевосита ҳамчун perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - амалгари дучанда AND.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -a             - амалгари дучанда AND.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - ягонӣ НЕ.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - қавси рост барои пӯшидани ифодаи гурӯҳ.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Рӯйхати додаҳо барои барқарор намудан:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - интерфейси X истифода баред.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    бо нобаёнӣ %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - чоп намоед тэг url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - tag buildhost: build host -ро чоп намоед.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Модули танзимоти Konsole"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - чопи тасвироти тэг: тасвирот.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - чопи epoch тэг: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - барориш рӯйхати файлҳои баста.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - чопи гурӯҳи тэг: гурӯҳ.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+"  --obsoletes    - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+"  --provides     - тэг provides-ро чоп намоед: ҳамаи файлҳои "
+"пешниҳодшаванда.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     -  тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - чопи ҳаҷми тэг: ҳаҷм.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - тэг sourcerpm-ро чоп намоед: rpm-и аввала.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+"  --obsoletes    - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - чопи ҷамъбасти тэг: ҷамъбаст.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - чоп намоед тэг url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - ҳолати муфассал.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - барориш рӯйхати файлҳои баста.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - тафсир, релиз ва архитектураро бо номҳояшон чоп намоед.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2340,36 +2349,31 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Афзоиш"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Афзоиш"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Коргузорӣ ба итмом расид"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Коргузорӣ ба итмом расид"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2377,12 +2381,12 @@ msgid ""
 msgstr ""
 "Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Интихоби шумо чист? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2390,7 +2394,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2398,19 +2402,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Ба ҳар ҳол давом диҳем?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Ҳ/н) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2419,7 +2423,7 @@ msgstr ""
 "Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2428,13 +2432,13 @@ msgstr ""
 "Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 "хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2445,7 +2449,7 @@ msgstr ""
 "кард, онгоҳ коргузориро давом додан мумкин нест\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2456,12 +2460,12 @@ msgstr ""
 "кард, онгоҳ коргузориро давом додан мумкин нест\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2471,7 +2475,7 @@ msgstr ""
 "Шумо бояд ҳуқуқи root-ро дошта бошед барои насб намудани вобастагиҳоизерин:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2480,39 +2484,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
@@ -2962,13 +2966,13 @@ msgstr "  -f             - ба таври маҷбурӣ файлҳои hdlist-
 msgid "Only superuser is allowed to update media"
 msgstr "Танҳо фавқулкорванд барои навсозии муҳит рухсат дорад"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "ба навкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia-ро истифода баред)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2977,17 +2981,17 @@ msgstr ""
 "элемент барои нав кардан ҳозир нест\n"
 "(яке аз %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Таҳрири сарчашмаи \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "хориҷкунии миёнаи \"%s\""
diff --git a/po/th.po b/po/th.po
index 281ec090..9016f2e0 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2002-11-25 13:52-0500\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -47,7 +47,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -59,7 +59,7 @@ msgstr ""
 "คุณจะต้องเป็นรูทในการติดตั้ง ความเป็นอิสระ :\n"
 "%s\n"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -69,22 +69,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_ติดตั้ง"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_บันทึก"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_ยกเลิก"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
@@ -182,12 +182,12 @@ msgstr "  --media        - เลือกใช้เฉพาะมีเด�
 msgid "No packages specified"
 msgstr "ไม่มีการกำหนดคำสั่ง"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, fuzzy, c-format
 msgid "Please wait..."
 msgstr "กรุณารอ"
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "พอร์ตของเม้าส์"
@@ -215,42 +215,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "ออกจากการติดตั้ง"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "เลิก"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -258,57 +258,64 @@ msgid ""
 "Continue installation anyway?"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(แพ็คเก็จ %d ชุด, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ไม่สามารถเรียก source package,กำลังยกเลิก"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "กำลังเตรียม..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, fuzzy, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 "กำลังติดตั้งแพ็คเก็จ %s\n"
 "%d%%"
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "การอ่านข้อมูลล้มเหลว: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -318,28 +325,27 @@ msgstr ""
 "การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
 "ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "install เสร็จเรียบร้อย"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "กำลังติดตั้ง $rpm\n"
@@ -411,58 +417,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "การอ่านข้อมูลเรียบร้อย"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "การอ่านข้อมูลล้มเหลว: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ไม่สามารถใช้งาน \"%s\" ใน file [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "ลงทะเบียน local package มีข้อผิดพลาด"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -502,22 +502,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -609,82 +609,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "ล็อกอินล้มเหลว"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "ไม่มี kdesu "
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "ไม่มี kdesu "
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "ไม่มี kdesu "
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "การอ่านข้อมูลล้มเหลว: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ไม่รู้จักโปรโตคอลที่ระบุไว้%s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ไม่สามารถใช้งานโปรโตคอล: %s"
@@ -704,58 +709,58 @@ msgstr "หา %s package ไม่พบ"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "ไม่สามารถสร้างข้อมูลเฉพาะตัวของผู้ใช้สำหรับ ssh"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "การอ่านข้อมูลล้มเหลว: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
@@ -800,75 +805,80 @@ msgstr "คำเตือน"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "ต้องการทดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้ากันได้? (y/N)"
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "การติดตั้งสามารถทำได้"
@@ -1070,7 +1080,7 @@ msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
@@ -1110,32 +1120,32 @@ msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "กำลังดึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1150,94 +1160,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "กำลังอ่านไฟล์ rpm จาก [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nnม"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yyช"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "การเลือกไม่ถูกต้อง ลองใหม่ครับ\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "ค้นหา"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1319,291 +1334,6 @@ msgstr "กำลังติดตั้ง %s"
 msgid "unmounting %s"
 msgstr "กำลังถอดถอน %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf เวอร์ชั่นที่ %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
-"\n"
-"วิธีใช้:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - พิมพ์ข้อความช่วย\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน บัก).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, fuzzy, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, fuzzy, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  -P             - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - โหมดคำ\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -u             - ลบแพ็คเกจถ้าแพ็คเกจที่ดีกว่ามีการติดตั้งอยู่แล้ว.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -q             - โหมดเงียบ\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -q             - โหมดเงียบ\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - ใช้อินเทอร์เฟส X\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "  -a             - เลือกมีเดียทั้งหมด\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help         - พิมพ์ข้อความช่วย\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "โมดูลปรับแต่งคอนโซล K"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - พิมพ์ข้อความช่วย\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - พิมพ์ข้อความช่วย\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     -พิมพ์  tag provides: all provides (หลายบรรทัด). "
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - พิมพ์  tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help         - พิมพ์ข้อความช่วย\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --group        - พิมพ์ tag group: group."
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - พิมพ์ tag summary: summary"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help         - พิมพ์ข้อความช่วย\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -v             - โหมดคำ\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - เวอร์ชั่นที่พิมพ์, รีลีสและ arch พร้อมชื่อ.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "สร้าง hdlist synthesis file สำหรับ อุปกรณ์ \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1620,7 +1350,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "ไม่มี package ที่ชื่อ %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "packages ต่อไปนี้มี %s: %s"
@@ -1630,66 +1360,66 @@ msgstr "packages ต่อไปนี้มี %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "ไม่มี kdesu "
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, fuzzy, c-format
 msgid "due to unsatisfied %s"
 msgstr "ไม่มี kdesu "
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Window border theme"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "%s ขัดแย้งกับ %s"
@@ -1780,6 +1510,12 @@ msgstr "  --list         - แสดงรายชื่อแพ็คเก�
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1807,81 +1543,354 @@ msgstr "  -v             - โหมดคำ\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "แพ็คเก็จ %d ชุด"
 
-#: ../urpme:106
+#: ../urpme:108
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "แพ็คเกจ %s ที่กำลังลบอยู่จะทำให้ระบบเสียหายได้\n"
 
-#: ../urpme:126
+#: ../urpme:128
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "ไม่มีแท็กที่จะลบ!"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "ไม่มีแท็กที่จะลบ!"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, 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] "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "กำลังนำอุปกรณ์ที่เคลื่อนย้ายได้จาก \"%s\" ออกมา"
 
-#: ../urpme:181
+#: ../urpme:185
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "ล็อกอินล้มเหลว"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "ล็อกอินล้มเหลว"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf เวอร์ชั่นที่ %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
+"\n"
+"วิธีใช้:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - พิมพ์ข้อความช่วย\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน บัก).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, fuzzy, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, fuzzy, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, fuzzy, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  -P             - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
+
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - โหมดคำ\n"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -u             - ลบแพ็คเกจถ้าแพ็คเกจที่ดีกว่ามีการติดตั้งอยู่แล้ว.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -q             - โหมดเงียบ\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -q             - โหมดเงียบ\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - ใช้อินเทอร์เฟส X\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "  -a             - เลือกมีเดียทั้งหมด\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help         - พิมพ์ข้อความช่วย\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "โมดูลปรับแต่งคอนโซล K"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - พิมพ์ข้อความช่วย\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - พิมพ์ข้อความช่วย\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     -พิมพ์  tag provides: all provides (หลายบรรทัด). "
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - พิมพ์  tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help         - พิมพ์ข้อความช่วย\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --group        - พิมพ์ tag group: group."
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - พิมพ์ tag summary: summary"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help         - พิมพ์ข้อความช่วย\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -v             - โหมดคำ\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - เวอร์ชั่นที่พิมพ์, รีลีสและ arch พร้อมชื่อ.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "สร้าง hdlist synthesis file สำหรับ อุปกรณ์ \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2207,48 +2216,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "ออกจากการติดตั้ง"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "ออกจากการติดตั้ง"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "ต้องการเลือกอะไรครับ  (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2256,7 +2260,7 @@ msgid ""
 "%s"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, fuzzy, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2264,38 +2268,38 @@ msgid ""
 "%s"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr "แพ็คเกจ %s ที่กำลังลบอยู่จะทำให้ระบบเสียหายได้\n"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2306,7 +2310,7 @@ msgstr ""
 "%s\n"
 "คุณยอมให้ทำการลบทิ้งหรือไม่?"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2317,12 +2321,12 @@ msgstr ""
 "%s\n"
 "คุณยอมให้ทำการลบทิ้งหรือไม่?"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2332,44 +2336,44 @@ msgstr ""
 "คุณจะต้องเป็นรูทในการติดตั้ง ความเป็นอิสระ :\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "กรุณากด enter เมื่อพร้อม"
@@ -2789,29 +2793,29 @@ msgstr "  -f             - บังคับการสร้างไฟล�
 msgid "Only superuser is allowed to update media"
 msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ไม่มีการแก้ไข(use urpmi.addmedia เพื่อเพิ่มอุปกรณ์)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr "ขาดข้อมูลที่จะนำไป update(หนึ่งใน %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
diff --git a/po/tl.po b/po/tl.po
index dc7e5e52..e0c86f61 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-03-08 20:24+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Previous-Translator: Arys P. Deloso <arys@deloso.org>\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Pag-install ng RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, fuzzy, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "Ano ang gusto mong gawin?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "Pwede mong naising i-save na lang ito. Ano ang pili mo?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -86,22 +86,22 @@ msgstr ""
 "\n"
 "Pwede mong naising i-save na lang ito. Ano ang pili mo?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, fuzzy, c-format
 msgid "_Install"
 msgstr "I-install"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, fuzzy, c-format
 msgid "_Save"
 msgstr "Save"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Piliin ang lugar kung saan ise-save ang file"
@@ -212,12 +212,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Walang command na nabanggit"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, fuzzy, c-format
 msgid "Please wait..."
 msgstr "Pakihintay."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Kailangan na kayo ay root"
@@ -247,42 +247,42 @@ msgstr ""
 "Ilang package na hiniling ay hindi ma-install:\n"
 "%s"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Babala"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ayos"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr " (i-upgrade)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr " (i-install)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Isa sa mga sumusunod na package ay kailangan:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "_Abort"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -293,7 +293,7 @@ msgstr ""
 "%s\n"
 "Magpatuloy?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -301,7 +301,7 @@ msgstr ""
 "Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
 "package ay ii-install (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -309,44 +309,51 @@ msgstr ""
 "Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
 "package ay ii-install (%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "hindi makuha ang mga source package, hindi tumutuloy"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Naghahanda..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Ini-install ang package na `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Pakisuksok ang medium na may pangalang \"%s\" sa device na [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Dina-download ang package na `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...pagkukuha muli nabigo: %s"
+
+#: ../gurpmi2:361
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Tapos"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -357,28 +364,27 @@ msgstr ""
 "%s\n"
 "Baka gusto mong i-update ang iyong urpmi database"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Pag-i-install ay nabigo"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Lahat ay naka-install na"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Natapos na ang pag-install"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "inaalis ang %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "sinisimulan muli ang urpmi"
@@ -454,58 +460,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "ginagamit ang specific environment sa %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "hindi mabuksan ang rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "inbalidong pangalan ng rpm file [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "kinukuha muli ang rpm file [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...pagkukuha muli natapos"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pagkukuha muli nabigo: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "hindi ma-access ang rpm file [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "hindi ma-parse ang \"%s\" sa file [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "hindi mairehistro ang rpm file"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "error sa pagrerehistro ng mga local package"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -545,22 +545,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -652,82 +652,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Pagkokopya nabigo"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "dahil sa nawawalang %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "dahil sa nawawalang %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "dahil sa nawawalang %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "inaalis ang %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...pagkukuha muli nabigo: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "hindi kilalang protocol naka-define para sa %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "walang nahanap na webfetch, mga suportadong webfetch ay: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "hindi ma-handle ang protocol: %s"
@@ -747,12 +752,12 @@ msgstr "package na %s ay hindi nahanap."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -760,47 +765,47 @@ msgstr ""
 "gumawa ng transaksyon para sa pag-i-install sa %s (alisin=%d, i-install=%d, "
 "i-upgrade=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "hindi magawa ang transaksyon"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "hindi maalis ang package na %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "hindi ma-install ang package na %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "ini-install ang %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...pagkukuha muli nabigo: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "inaalis ang package na %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "inaalis ang package na %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "ini-install ang %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "Mas maraming inpormasyon sa package..."
@@ -845,75 +850,80 @@ msgstr "Babala"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Pag-i-install ay nabigo"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Pag-i-install ay nabigo"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Ang mga sumusunod na package ay may masamang signature"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Ang mga sumusunod na package ay may masamang signature"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Gusto mong ituloy ang pag-i-install ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "ini-install ang %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "dini-distribute ang %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "ini-install ang %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "ini-install ang %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Subukan ang pag-i-install na hindi sinusuri ang mga dependency? (o/H) "
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Subukan ang pag-i-install nang mas malakas (--force)? (o/H) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Pag-i-install ay maaari"
@@ -1118,7 +1128,7 @@ msgstr "pagkopya ng [%s] nabigo (file ay kahina-hinalang maliit)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "kino-compute ang md5sum ng nakuhang source hdlist (o synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "pagkopya ng [%s] nabigo (md5sum di-tugma)"
@@ -1158,32 +1168,32 @@ msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "kinukuha muli ang source hdlist (o synthesis) ng \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "sinusuri ang pubkey file ng \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...in-import ang key na %s mula sa pubkey file ng \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "hindi ma-import ang pubkey file ng \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "idinagdag ang medium na %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1198,94 +1208,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "binabasa ang mga rpm file mula sa [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "HhNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "OoYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (o/H) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Sorry, masamang pili, subukan muli\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Maghanap"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "inaalis ang medium na \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1368,315 +1383,6 @@ msgstr "mina-mount ang %s"
 msgid "unmounting %s"
 msgstr "ina-unmount ang %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
-"GPL.\n"
-"\n"
-"paggamit:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - i-print itong tulong na mensahe.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - gumamit ng specific na environment o kapaligiran\n"
-"                   (karaniwan ay isang ulat sa bug).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - huwag gamitin ang binigay na media, hiniwalay ng kuwit.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - iayos ang media ayon sa mga substring na hiniwalay ng "
-"kuwit.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
-"database.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
-"database.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - huwag i-print ang mga magkatulad na linya.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - gamitin lang ang update media.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - masalita na paraan.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - balewalain ang pagkakaiba ng case/laki ng titik sa bawat\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - balewalain ang pagkakaiba ng case/laki ng titik sa bawat\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - isama nang direkta ang perl code bilang perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr ""
-"  -a             - binary AND operator, totoo kung parehong expression ay "
-"totoo.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr ""
-"  -o             - binary OR operator, totoo kung isang expression ay "
-"totoo.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -q             - tahimik na paraan.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  )              - kanang parenthesis para isara ang grupo ng expression.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Talaan ng data na ibabalik:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - gamitin ang X interface.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    defaults ay %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - i-print ang tag url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - i-print ang tag buildhost: build host.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Module para sa pagco-configure ng Konsole"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-"  --conflicts    - i-print ang tag conflicts: lahat ng pagkakasalungat.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - i-print ang tag description: paglalarawan.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - i-print ang tag epoch: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --all          - i-print lahat ng mga tag.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - ilista ang mga file sa package.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - i-print ang tag group: grupo.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --all          - i-print lahat ng mga tag.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --all          - i-print lahat ng mga tag.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - i-print ang tag packager: taga-package.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - i-print ang tag provides: lahat ng binibigay.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - i-print ang tag requires: lahat ng kinakailangan.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - i-print ang tag size: laki.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - i-print ang tag sourcerpm: source rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - i-print ang tag summary: kabuuan.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - i-print ang tag url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - masalita na paraan.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - ilista ang mga file sa package.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - i-print ang version, release o labas at arch o "
-"arkitektura\n"
-"                   kasama ang pangalan.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "isinusulat ang list file para sa medium na \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1693,7 +1399,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Walang package na may pangalang %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
@@ -1703,47 +1409,47 @@ msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Lahat ay naka-install na"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Lahat ay naka-install na"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Lahat ay naka-install na"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "dahil sa nawawalang %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Lahat ay naka-install na"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "dahil sa hindi na-satisfy na %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "sinusubukang i-promote ang %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "para maitago ang %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1752,7 +1458,7 @@ msgstr ""
 "Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1761,12 +1467,12 @@ msgstr ""
 "Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "para ma-install ang %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "dahil sa pagkakasalungat sa %s"
@@ -1862,6 +1568,13 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1894,39 +1607,39 @@ msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - piliin lahat ng package na tumutugma sa expression.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "hindi kilalang mga package"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "hindi kilalang package"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "ang pag-aalis ng package na %s ay sisira ng sistema mo"
 msgstr[1] "ang pag-aalis ng package na %s ay sisira ng sistema mo"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Walang maaalis"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Walang maaalis"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1936,45 +1649,341 @@ msgstr[0] ""
 msgstr[1] ""
 "Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "hindi kilalang package"
 msgstr[1] "hindi kilalang package"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "inaalis ang package na %s"
 msgstr[1] "inaalis ang package na %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (o/H) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "kinukuha ang naaalis na device bilang \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Pag-aalis nabigo"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Pag-aalis nabigo"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
+"GPL.\n"
+"\n"
+"paggamit:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - i-print itong tulong na mensahe.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - gumamit ng specific na environment o kapaligiran\n"
+"                   (karaniwan ay isang ulat sa bug).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - huwag gamitin ang binigay na media, hiniwalay ng kuwit.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - iayos ang media ayon sa mga substring na hiniwalay ng "
+"kuwit.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
+"database.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
+"database.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - huwag i-print ang mga magkatulad na linya.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - gamitin lang ang update media.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - masalita na paraan.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - balewalain ang pagkakaiba ng case/laki ng titik sa bawat\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - balewalain ang pagkakaiba ng case/laki ng titik sa bawat\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - isama nang direkta ang perl code bilang perl -e.\n"
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr ""
+"  -a             - binary AND operator, totoo kung parehong expression ay "
+"totoo.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr ""
+"  -o             - binary OR operator, totoo kung isang expression ay "
+"totoo.\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -q             - tahimik na paraan.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  )              - kanang parenthesis para isara ang grupo ng expression.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Talaan ng data na ibabalik:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - gamitin ang X interface.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    defaults ay %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - i-print ang tag url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - i-print ang tag buildhost: build host.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Module para sa pagco-configure ng Konsole"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+"  --conflicts    - i-print ang tag conflicts: lahat ng pagkakasalungat.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - i-print ang tag description: paglalarawan.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - i-print ang tag epoch: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --all          - i-print lahat ng mga tag.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - ilista ang mga file sa package.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - i-print ang tag group: grupo.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --all          - i-print lahat ng mga tag.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --all          - i-print lahat ng mga tag.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - i-print ang tag packager: taga-package.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - i-print ang tag provides: lahat ng binibigay.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - i-print ang tag requires: lahat ng kinakailangan.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - i-print ang tag size: laki.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - i-print ang tag sourcerpm: source rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - i-print ang tag summary: kabuuan.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - i-print ang tag url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - masalita na paraan.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - ilista ang mga file sa package.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - i-print ang version, release o labas at arch o "
+"arkitektura\n"
+"                   kasama ang pangalan.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "isinusulat ang list file para sa medium na \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2334,36 +2343,31 @@ msgstr ""
 "Error: mukhang ang %s ay nakalapat na read-only.\n"
 "Gamitin ang --allow-force upang pilitin ang operasyon."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (i-upgrade)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (i-upgrade)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (i-install)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (i-install)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2371,12 +2375,12 @@ msgid ""
 msgstr ""
 "Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ano ang pili mo? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2387,7 +2391,7 @@ msgstr ""
 "pakete na mas-luma sa nakaluklok:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, fuzzy, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2398,19 +2402,19 @@ msgstr ""
 "pakete na mas-luma sa nakaluklok:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Magpatuloy kahit paano?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (O/h) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2419,7 +2423,7 @@ msgstr ""
 "Ilang package na hiniling ay hindi ma-install:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2428,12 +2432,12 @@ msgstr ""
 "Ilang package na hiniling ay hindi ma-install:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "ang pag-aalis ng package na %s ay sisira ng sistema mo"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2444,7 +2448,7 @@ msgstr ""
 "package ay dapat alisin para ma-upgrade ang iba:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2455,12 +2459,12 @@ msgstr ""
 "package ay dapat alisin para ma-upgrade ang iba:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2470,7 +2474,7 @@ msgstr ""
 "Kailangan mong maging root para i-install ang mga sumusunod na dependency:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2479,39 +2483,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, 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:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "I-cancel"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pindutin ang Enter kung handa na..."
@@ -2961,13 +2965,13 @@ msgstr "  -f             - pilitin ang paggawa ng mga hdlist file.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "walang ia-update (gamitin ang urpmi.addmedia para magdagdag ng media)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2976,17 +2980,17 @@ msgstr ""
 "ang entry na ia-update ay nawawala\n"
 "(isa sa mga %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Ini-edit ang medium na \"%s\":"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "inaalis ang medium na \"%s\""
diff --git a/po/tr.po b/po/tr.po
index 7d6c06de..87bfc9cd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -19,10 +19,10 @@ msgstr ""
 "PO-Revision-Date: 2009-02-18 08:35+0200\n"
 "Last-Translator: Atilla ÖNTAŞ <atilla_ontas@mandriva.com>\n"
 "Language-Team: Turkish <cooker-i18n@mandrivalinux.org>\n"
-"cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"cooker-i18n@mandrivalinux.org>\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 0.3\n"
 
@@ -151,12 +151,14 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - Sistemi güncellemek için paketleri otomatik seç.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - bazı paketlerin bulunamama durumda bile işlemin\n"
 "                   devamına zorla.\n"
@@ -173,7 +175,8 @@ msgstr ""
 #: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media       - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
+msgstr ""
+"  --media       - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
 
 #: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
@@ -201,7 +204,8 @@ msgstr "  --test         - kurulumun başarılı olup olmayacağını doğrula.\
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - istenen paketleri sadece verilen kurulum kaynaklarında "
 "ara.\n"
@@ -296,13 +300,17 @@ msgstr ""
 
 #: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kurulması gerekiyor:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kurulması gerekiyor:"
 
 #: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kurulması gerekiyor:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kurulması gerekiyor:"
 
 #: ../gurpmi2:256
 #, c-format
@@ -756,8 +764,10 @@ msgstr "[tekrar paketleniyor]"
 
 #: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "%s üzerine yükleme için işlem yaratıldı (sil=%d, yükle=%d, güncelle=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"%s üzerine yükleme için işlem yaratıldı (sil=%d, yükle=%d, güncelle=%d)"
 
 #: ../urpm/install.pm:170
 #, c-format
@@ -952,7 +962,8 @@ msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
 #: ../urpm/media.pm:456
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
-msgstr "çıkartılabilir disk aktarımı başarısız oldu, kurulum kaynağı yok sayılıyor"
+msgstr ""
+"çıkartılabilir disk aktarımı başarısız oldu, kurulum kaynağı yok sayılıyor"
 
 #: ../urpm/media.pm:499 ../urpm/media.pm:505
 #, c-format
@@ -1391,8 +1402,10 @@ msgstr "urpmi yeniden başlatıldı, önemli paketlerin listesi değişmedi"
 
 #: ../urpm/select.pm:32
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi yeniden başlatıldı ve önemli paketlerin listesi değişti: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi yeniden başlatıldı ve önemli paketlerin listesi değişti: %s vs %s"
 
 #: ../urpm/select.pm:170
 #, c-format
@@ -1576,7 +1589,8 @@ msgstr ""
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - sadece rpm veritabanını güncelle, dosya sistemini değil.\n"
+msgstr ""
+"  --justdb       - sadece rpm veritabanını güncelle, dosya sistemini değil.\n"
 
 #: ../urpme:56
 #, c-format
@@ -1637,7 +1651,8 @@ msgstr "Kaldırılacak bir şey yok"
 #: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] ""
 "Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kaldırılması gerekiyor."
 "(%d)"
@@ -1698,7 +1713,8 @@ msgstr "  --version      - bu aracın sürüm numarasını yazdır.\n"
 #: ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - belirli bir çevre kullan (genellikle bir hata raporu).\n"
+msgstr ""
+"  --env          - belirli bir çevre kullan (genellikle bir hata raporu).\n"
 
 #: ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
@@ -1709,14 +1725,16 @@ msgstr ""
 
 #: ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - örnekleri eşleştirme, argümanı bri tam satır olarak "
 "kullan.\n"
 
 #: ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - virgülle ayrılan alt satırlara göre kurulum kaynağı "
 "sırala.\n"
@@ -1724,12 +1742,14 @@ msgstr ""
 #: ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - kurulum kaynağına erişim için verilen yolu kullan.\n"
+msgstr ""
+"  --use-distrib  - kurulum kaynağına erişim için verilen yolu kullan.\n"
 
 #: ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
+msgstr ""
+"  --synthesis    - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
 
 #: ../urpmf:45
 #, c-format
@@ -1749,17 +1769,20 @@ msgstr "  --verbose             - kalabalık kipi.\n"
 #: ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - her örnekte büyük-küçük harf farklılığını göz ardı et.\n"
+msgstr ""
+"  -i             - her örnekte büyük-küçük harf farklılığını göz ardı et.\n"
 
 #: ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             -  örneklerde büyük/küçük harf ayrımını gözet.(varsayılan)\n"
+msgstr ""
+"  -I             -  örneklerde büyük/küçük harf ayrımını gözet.(varsayılan)\n"
 
 #: ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - alan ayracını değiştir. (':' işaretinde varsayılan).\n"
+msgstr ""
+"  -F<str>        - alan ayracını değiştir. (':' işaretinde varsayılan).\n"
 
 #: ../urpmf:51
 #, c-format
@@ -2040,7 +2063,8 @@ msgstr "  --buildrequires - paketlerin derleme gerekliliklerini kurar.\n"
 #: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - sadece kaynak kodu paketlerini kur (ikilileri değil).\n"
+msgstr ""
+"  --install-src  - sadece kaynak kodu paketlerini kur (ikilileri değil).\n"
 
 #: ../urpmi:99
 #, c-format
@@ -2054,7 +2078,8 @@ msgstr "  --noclean      - rpm'yi ön bellekte kullanılmadan sakla\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - sistemde yüklü paketleri yüklemeye zorla.\n"
 
 #: ../urpmi:104
@@ -2251,7 +2276,8 @@ msgstr "  --debug             - oldukça kalabalık kip.\n"
 #: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  komut satırından isimleri veya rpm dosyaları verilenler yüklenecek.\n"
+msgstr ""
+"  komut satırından isimleri veya rpm dosyaları verilenler yüklenecek.\n"
 
 #: ../urpmi:183
 #, c-format
@@ -2270,7 +2296,8 @@ msgstr ""
 #: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
-msgstr "--install-src parametresi kulanılırken ikili rpm dosyalarını kuramazsınız."
+msgstr ""
+"--install-src parametresi kulanılırken ikili rpm dosyalarını kuramazsınız."
 
 #: ../urpmi:221
 #, c-format
@@ -2284,7 +2311,8 @@ msgstr "--buildrequires parametresine varsayılan"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "Lütfen, --buildrequires parametresine varsayılan olması için, --"
 "buildrequires veya --install-src parametrelerini kullanın."
@@ -2341,7 +2369,8 @@ msgstr "%s (kurulum için)"
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
-msgstr "'%s' bağımlılık sorununu aşabilmek için, aşağıdaki paketlerden biri gerekli:"
+msgstr ""
+"'%s' bağımlılık sorununu aşabilmek için, aşağıdaki paketlerden biri gerekli:"
 
 #: ../urpmi:440
 #, c-format
@@ -2637,7 +2666,8 @@ msgstr "  --nopubkey     -eklenen  kaynağın ortak anahtarını alma.\n"
 #: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - yapılandırmaya kurulum kaynağını ekle; ancak güncelleme.\n"
+msgstr ""
+"  --raw          - yapılandırmaya kurulum kaynağını ekle; ancak güncelleme.\n"
 
 #: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
@@ -2740,7 +2770,8 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - verilen tarih/süre argümanından beri yapılan tüm "
 "işlemleri listele.\n"
@@ -2753,7 +2784,8 @@ msgstr "  --list-all     - rpmdb'deki tüm işlemleri listele (uzun)\n"
 #: ../urpmi.recover:39
 #, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
-msgstr "  --list-safe    - denetleme noktasından beri olan işlemleri listele.\n"
+msgstr ""
+"  --list-safe    - denetleme noktasından beri olan işlemleri listele.\n"
 
 #: ../urpmi.recover:40
 #, c-format
@@ -2804,17 +2836,20 @@ msgstr "Suni komut satırı argümanları [%s]\n"
 #: ../urpmi.recover:84
 #, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Aynı anda hem --rollback hem de --cehckpoint komutlarını belirleyemezsiniz.\n"
+msgstr ""
+"Aynı anda hem --rollback hem de --cehckpoint komutlarını belirleyemezsiniz.\n"
 
 #: ../urpmi.recover:86
 #, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "Aynı anda hem --checkpoint hem de --list komutlarını belirleyemezsiniz.\n"
+msgstr ""
+"Aynı anda hem --checkpoint hem de --list komutlarını belirleyemezsiniz.\n"
 
 #: ../urpmi.recover:88
 #, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
-msgstr "Aynı anda hem --rollback hem de --list komutlarını belirleyemezsiniz.\n"
+msgstr ""
+"Aynı anda hem --rollback hem de --list komutlarını belirleyemezsiniz.\n"
 
 #: ../urpmi.recover:90
 #, c-format
@@ -2868,7 +2903,8 @@ msgstr "  -a             - tüm kaynakları seçer.\n"
 #: ../urpmi.removemedia:42
 #, c-format
 msgid "  -y             - fuzzy match on media names.\n"
-msgstr "  -y             - kurulum kaynağı isimleri üzerinde bulanık eşleşme.\n"
+msgstr ""
+"  -y             - kurulum kaynağı isimleri üzerinde bulanık eşleşme.\n"
 
 #: ../urpmi.removemedia:59
 #, c-format
@@ -2918,7 +2954,8 @@ msgstr "  --ignore       - güncelleme, kaynağı yok sayılan olarak işaretle.
 #: ../urpmi.update:47
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr "  --no-ignore    - güncelleme, kaynağı etkinleştirilmiş olarak işaretle.\n"
+msgstr ""
+"  --no-ignore    - güncelleme, kaynağı etkinleştirilmiş olarak işaretle.\n"
 
 #: ../urpmi.update:49
 #, c-format
@@ -3033,7 +3070,8 @@ msgstr ""
 #: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - --parallel kullanırken erişilebilir düğümleri listele.\n"
+msgstr ""
+"  --list-nodes   - --parallel kullanırken erişilebilir düğümleri listele.\n"
 
 #: ../urpmq:62
 #, c-format
@@ -3042,17 +3080,21 @@ msgstr "  --list-aliases   - mevcut parelel alias'lari listele.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - yapılandırmayı urpmi.addmedia argümanı biçiminde boşalt.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - yapılandırmayı urpmi.addmedia argümanı biçiminde boşalt.\n"
 
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          -  ardından gelen paket bir kaynak paketi ( -s ile aynı).\n"
+msgstr ""
+"  --src          -  ardından gelen paket bir kaynak paketi ( -s ile aynı).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - İndirmeye başlamadan önce tüm kaynak paketleri yolla."
 "(Sadece root için geçerlidir).\n"
@@ -3173,12 +3215,14 @@ msgstr "  -m             - du'nun eşiti.\n"
 #: ../urpmq:104
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - isminin yanıda sürüm numarasını ve dağıtımını da yazar.\n"
+msgstr ""
+"  -r             - isminin yanıda sürüm numarasını ve dağıtımını da yazar.\n"
 
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - bir sonraki paket bir kaynak paketidir(--src ile aynı).\n"
+msgstr ""
+"  -s             - bir sonraki paket bir kaynak paketidir(--src ile aynı).\n"
 
 #: ../urpmq:106
 #, c-format
@@ -3202,7 +3246,8 @@ msgstr ""
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  komut satırından isimleri veya rpm dosyaları verilenler sorgulandı.\n"
+msgstr ""
+"  komut satırından isimleri veya rpm dosyaları verilenler sorgulandı.\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3235,14 +3280,16 @@ msgstr ""
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "\"%s\" ortamı için xml bilgisi bulunamadı. %s paketi için herhangi bir sonuç "
 "döndürülemedi."
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "\"%s\" ortamı için xml bilgisi bulunamadı. %s paketleri için herhangi bir "
 "sonuç döndürülemedi."
@@ -3287,4 +3334,3 @@ msgstr "Değişiklik günlüğü bulunamadı!\n"
 
 #~ msgid "Checking to remove the following packages"
 #~ msgstr "Kaldırılmaları için sıradaki paketler sınanıyor"
-
diff --git a/po/uk.po b/po/uk.po
index 4824eb66..0676e10f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-09-04 22:14+0300\n"
 "Last-Translator: Taras Boychuk <btr0001@ukr.net>\n"
 "Language-Team: ukrainian <translation@linux.org.ua>\n"
@@ -20,24 +20,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Встановлення RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Помилка: неможливо знайти файл %s, дію припинено"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_O Гаразд"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -58,7 +59,7 @@ msgstr ""
 "\n"
 "Що Ви хочете зробити?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -73,7 +74,7 @@ msgstr ""
 "\n"
 "Можливо, Ви хочете просто зберегти його. Який Ваш вибір?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -88,22 +89,22 @@ msgstr ""
 "\n"
 "Можливо, Ви хочете просто зберегти його. Який Ваш вибір?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Встановити"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "З_берегти"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_C Скасувати"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Виберіть місце для збереження файла"
@@ -146,12 +147,15 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select — автоматично вибрати пакунки для поновлення системи.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select — автоматично вибрати пакунки для поновлення системи.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        — примусово виконати, навіть якщо деяких пакунків не "
 "існує.\n"
@@ -169,7 +173,8 @@ msgstr ""
 #: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        — використовувати тільки задані носії, відокремлені комою.\n"
+msgstr ""
+"  --media        — використовувати тільки задані носії, відокремлені комою.\n"
 
 #: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
@@ -195,7 +200,8 @@ msgstr "  --test         — лише перевірити, чи встанов�
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  — використовувати тільки задані носії для пошуку запитаних "
 "(або поновлюваних) пакунків.\n"
@@ -205,12 +211,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Не вибрано пакунків"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Будь ласка, зачекайте..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Потрібно бути root"
@@ -241,42 +247,42 @@ msgstr ""
 "%s\n"
 "Продовжувати встановлення?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Попередження"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Гаразд"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (поновити)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (встановити)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Вибір пакунків"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Потрібен один із наступних пакунків:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Перервати"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -287,17 +293,19 @@ msgstr ""
 "%s\n"
 "Продовжувати встановлення?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Наступний пакунок буде встановлено для задоволення залежностей:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Наступні пакунки буде встановлено для задоволення залежностей:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -305,37 +313,44 @@ msgstr[0] "(%d пакунок, %d Мб)"
 msgstr[1] "(%d пакунки, %d Мб)"
 msgstr[2] "(%d пакунків, %d Мб)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "неможливо одержати початкові пакунки, завершується"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Підготовка..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Встановлюється пакунок `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Вставте, будь ласка, носій з назвою «%s»"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Звантажується пакунок %s"
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...відновлення невдале: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "Виконано"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -346,28 +361,27 @@ msgstr ""
 "%s\n"
 "Можливо, Вам потрібно поновити вашу базу даних urpmi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Невдала спроба встановлення:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Все вже встановлено"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Встановлення завершено"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "вилучається %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "перезапуск urpmi"
@@ -441,58 +455,52 @@ msgstr "Каталогу середовища %s не існує"
 msgid "using specific environment on %s\n"
 msgstr "використовується особливе оточення на %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "неможливо відкрити rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "неправильна назва rpm-файла [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "відновлення rpm-файла [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...відновлення завершено"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...відновлення невдале: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "немає доступу до rpm-файла [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "неможливо проаналізувати файл %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "неможливо зареєструвати rpm-файл"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "rpm з несумісною архітектурою [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "помилка реєстрації пакунків"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Цю дію заборонено до виконання в обмеженому режимі"
@@ -534,22 +542,22 @@ msgstr ""
 "типово urpmf очікує на формальний вираз. Вам слід скористатися параметром «--"
 "literal»"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "каталогу chroot не існує"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Не можна використовувати %s без %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Не можна використовувати %s разом з %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Забагато аргументів\n"
@@ -647,82 +655,87 @@ msgstr "Невдалий запуск %s: завершено з сигналом
 msgid "%s failed: exited with %d"
 msgstr "Невдалий запуск %s: завершено з %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "помилка копіювання"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "відсутній wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "відсутній curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "Невдалий запуск curl: звантаження скасовано\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "Відсутній rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "Відсутній ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "Відсутня prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Не вдалося виконати prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "відсутня aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        звантажено %s%% з %s, оцінка часу = %s, швидкість = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        Звантажено %s%%, швидкість = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "отримання %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "отримано %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "для %s вказано невідомий протокол"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "не знайдено webfetch, підтримуються такі webfetch: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "неможливо обробити протокол: %s"
@@ -742,59 +755,60 @@ msgstr "пакунку %s не знайдено."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "відновлення rpm-файлів з носія \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[перепакування]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "створено транзакцію для встановлення на %s (вилучити=%d, встановити=%d, "
 "поновити=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "неможливо створити транзакцію"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "неможливо вилучити rpm з delta-rpm-пакунка %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "неможливо встановити пакунок %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "вилучення помилкового rpm (%s) з %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "вилучення %s зазнало невдачі: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Вилучення пакунка %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "вилучається пакунок %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "вилучення встановлених rpm (%s) з %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Додаткова інформація про пакунок %s"
@@ -839,18 +853,23 @@ msgstr "переривання"
 msgid "%s database is locked (another program is already using it)"
 msgstr "Базу даних %s заблоковано (її вже використовує інша програма)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Встановлення неуспішне"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Спробувати продовжити? (y/N) (т/Н)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -859,57 +878,57 @@ msgstr ""
 "Встановлення зазнало невдачі, помилкові rpm:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Наступний пакунок має неправильний підпис"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Наступні пакунки мають неправильні підписи"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ви хочете продовжувати встановлення?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "вилучення встановлених rpm (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "встановлюється %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "встановлюється %s з %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "встановлюється %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Спробувати встановлення без перевірки залежностей? (y/N) (т/Н) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Спробувати примусове встановлення (--force)? (y/N) (т/Н) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Пакунки є пакунками останніх версій"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Встановлення можливе"
@@ -1023,7 +1042,8 @@ msgstr "неможливо обробити media.cfg"
 #: ../urpm/media.pm:831
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "немає доступу до першого носія дистрибутива (не знайдено файла media.cfg)"
+msgstr ""
+"немає доступу до першого носія дистрибутива (не знайдено файла media.cfg)"
 
 #: ../urpm/media.pm:849
 #, c-format
@@ -1115,7 +1135,7 @@ msgstr "копіювання [%s] завершилось невдало (фай�
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "обчислення md5sum для отриманого файла synthesis джерела"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "спроба отримання [%s] завершилася невдало (не збігається md5sum)"
@@ -1155,32 +1175,32 @@ msgstr "для носія «%s» не знайдено метаданих"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "отримання файла synthesis джерела для «%s»..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "перевіряється файл ключів з \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...імпортовано ключ %s з файла ключів \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "неможливо імпортувати файл ключів з \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "для носія «%s» не знайдено файла synthesis"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "оновлено носій «%s»"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "спроба отримання [%s] завершилася невдало"
@@ -1195,94 +1215,99 @@ msgstr "повторна спроба з дзеркала %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Не вдалося знайти дзеркало зі списку дзеркал %s"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "знайдено розташування на земній кулі %s %.2f %.2f з часового поясу %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "отримання списку дзеркал з %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "НнNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ТтYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (Т/н) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Вибачте, неправильний вибір, спробуйте ще раз\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Пакунок"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Версія"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Випуск"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Арх."
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(пропонується)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "носій «%s»"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "командний рядок"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "Б"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "кБ"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "МБ"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "ГБ"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "ТБ"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1374,304 +1399,6 @@ msgstr "монтується %s"
 msgid "unmounting %s"
 msgstr "розмонтовується %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"версія urpmf %s\n"
-" Авторські права © 2002-2006 Mandriva.\n"
-" Це безкоштовна програма, її можна розповсюджуватися за дотримання умов GNU "
-"GPL.\n"
-"\n"
-"використання: urpmf [параметри] вираз-шаблон\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      — вивести номер версії інструмента.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          — використовувати специфічне оточення (звичайно звіт\n"
-"                   про помилку).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia — не використовувати вказані джерела, розділені комами.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  — не використовувати шаблонів, сприймати аргумент "
-"буквально.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   — використовувати іншого адміністративного користувача для "
-"встановлення urpmi db і rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    — сортувати джерела відповідно до підписів, відділених "
-"комами.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  — використовувати для доступу до носія вказаний шлях\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    — використовувати вказаний файл synthesis замість бази "
-"даних urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         — не виводити однакові рядки.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       — використовування тільки носії з поновленнями.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      — детальний режим.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             — нехтувати регістрами в усіх шаблонах.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             — зважати на регістр символів у шаблонах (типова "
-"поведінка).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        — змінити роздільник полів (типовим є «:»).\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Вирази-шаблони:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           — будь-який текст обробляється як формальний вираз, якщо не "
-"використано параметра -l.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             — включати код perl безпосередньо як perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             — двійковий оператор AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             — двійковий оператор OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              — унарний NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            — ліва і права дужки.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Список міток:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           — вказати формат виводу у стилі printf\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   приклад: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         — архітектура\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    — вузол збирання\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    — час збирання\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    — файли налаштування\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    — мітки конфліктів\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  — опис пакунка\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution — дистрибутив\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        — епоха\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     — назва файл пакунка\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        — список файлів, що містяться у пакунку\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        — група\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      — ліцензія\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         — назва пакунка\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    — мітки застарілих (obsoletes)\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     — пакувальник\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     — мітки дозволів (provides)\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     — мітки залежностей (requires)\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         — розмір після встановлення\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    — назва джерельного rpm\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     — мітки пропозицій (suggests)\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      — резюме\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          — адреса url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       — виробник\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             — носій, на якому було знайдено пакунок\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             — вивести версію, випуск і архів з назвою.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Неправильний формат: можна використовувати лише багатозначні мітки"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "немає файла hdlist для носія «%s»"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "немає файла synthesis для носія «%s»"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "немає файла xml-info для носія «%s»"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1679,7 +1406,8 @@ msgstr "urpmi було перезапущено, список пріоритет
 
 #: ../urpm/select.pm:32
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 "urpmi було перезапущено, список пріоритетних пакунків зазнав змін: %s проти %"
 "s"
@@ -1689,7 +1417,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Немає пакунку з назвою %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Наступні пакунки містять %s: %s"
@@ -1699,47 +1427,47 @@ msgstr "Наступні пакунки містять %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Потрібно використовувати \"-a\", щоб вказати їх усіх"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "знайдено пакунки %s у базі даних urpmi, але жоден з них не встановлено"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Пакунок %s вже встановлено"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Пакунки %s вже встановлено"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "через відсутність %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "через те, що вже встановлено %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "через незадоволеність %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "намагаюсь активізувати %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "для того, щоб зберегти %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1748,7 +1476,7 @@ msgstr ""
 "Наступний пакунок слід вилучити для того, щоб поновити інші:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1757,12 +1485,12 @@ msgstr ""
 "Наступні пакунки будуть вилучені для того, щоб поновити інші:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "для того, щоб встановити %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "через конфлікти з %s"
@@ -1836,7 +1564,8 @@ msgstr "  --auto-orphans — вилучити «осиротілі»\n"
 #: ../urpme:49
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         — перевірити, чи є коректний доступ до змінного пристрою.\n"
+msgstr ""
+"  --test         — перевірити, чи є коректний доступ до змінного пристрою.\n"
 
 #: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
@@ -1851,12 +1580,22 @@ msgstr "  --repackage    — перепакувати файли перед ви
 #: ../urpme:53
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         — використовувати інший root для rpm на змінному пристрої.\n"
+msgstr ""
+"  --root         — використовувати інший root для rpm на змінному пристрої.\n"
+
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   — використовувати іншого адміністративного користувача для "
+"встановлення urpmi db і rpm.\n"
 
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       — оновлювати лише базу даних rpm, а не файлову систему.\n"
+msgstr ""
+"  --justdb       — оновлювати лише базу даних rpm, а не файлову систему.\n"
 
 #: ../urpme:56
 #, c-format
@@ -1883,48 +1622,52 @@ msgstr "  --verbose      — детальний режим.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             — вибрати всі пакунки відповідно до розширення.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Тільки користувачу root дозволяється вилучати пакунки"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "невідомі пакунки"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "невідомий пакунок"
 
-#: ../urpme:121
+#: ../urpme:123
 #, 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] "Вилучення наведених нижче пакунків призведе до пошкодження вашої системи:"
-msgstr[2] "Вилучення наведених нижче пакунків призведе до пошкодження вашої системи:"
+msgstr[0] ""
+"Вилучення наведеного нижче пакунка призведе до пошкодження вашої системи:"
+msgstr[1] ""
+"Вилучення наведених нижче пакунків призведе до пошкодження вашої системи:"
+msgstr[2] ""
+"Вилучення наведених нижче пакунків призведе до пошкодження вашої системи:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Нічого вилучати"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "«Осиротілих» пакунків немає"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "Щоб задовольнити залежності, буде вилучено %d пакунок"
 msgstr[1] "Щоб задовольнити залежності, буде вилучено %d пакунків"
 msgstr[2] "Щоб задовольнити залежності, буде вилучено %d пакунків"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1932,7 +1675,7 @@ msgstr[0] "(«осиротілий» пакунок)"
 msgstr[1] "(«осиротілі» пакунки)"
 msgstr[2] "(«осиротілих» пакунків)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1940,31 +1683,319 @@ msgstr[0] "Вилучити %d пакунок?"
 msgstr[1] "Вилучити %d пакунки?"
 msgstr[2] "Вилучити %d пакунків?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (Т/н) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "перевірка можливості вилучення %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Вилучення зазнало невдачі"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Вилучення можливе"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"версія urpmf %s\n"
+" Авторські права © 2002-2006 Mandriva.\n"
+" Це безкоштовна програма, її можна розповсюджуватися за дотримання умов GNU "
+"GPL.\n"
+"\n"
+"використання: urpmf [параметри] вираз-шаблон\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      — вивести номер версії інструмента.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          — використовувати специфічне оточення (звичайно звіт\n"
+"                   про помилку).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia — не використовувати вказані джерела, розділені комами.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  — не використовувати шаблонів, сприймати аргумент "
+"буквально.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    — сортувати джерела відповідно до підписів, відділених "
+"комами.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --use-distrib  — використовувати для доступу до носія вказаний шлях\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    — використовувати вказаний файл synthesis замість бази "
+"даних urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         — не виводити однакові рядки.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       — використовування тільки носії з поновленнями.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      — детальний режим.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             — нехтувати регістрами в усіх шаблонах.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             — зважати на регістр символів у шаблонах (типова "
+"поведінка).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        — змінити роздільник полів (типовим є «:»).\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Вирази-шаблони:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           — будь-який текст обробляється як формальний вираз, якщо не "
+"використано параметра -l.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             — включати код perl безпосередньо як perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             — двійковий оператор AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             — двійковий оператор OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              — унарний NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            — ліва і права дужки.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Список міток:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           — вказати формат виводу у стилі printf\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   приклад: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         — архітектура\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    — вузол збирання\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    — час збирання\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    — файли налаштування\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    — мітки конфліктів\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  — опис пакунка\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution — дистрибутив\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        — епоха\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     — назва файл пакунка\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        — список файлів, що містяться у пакунку\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        — група\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      — ліцензія\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         — назва пакунка\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    — мітки застарілих (obsoletes)\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     — пакувальник\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     — мітки дозволів (provides)\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     — мітки залежностей (requires)\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         — розмір після встановлення\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    — назва джерельного rpm\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     — мітки пропозицій (suggests)\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      — резюме\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          — адреса url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       — виробник\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             — носій, на якому було знайдено пакунок\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             — вивести версію, випуск і архів з назвою.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "незавершений вираз (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Неправильний формат: можна використовувати лише багатозначні мітки"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "немає файла hdlist для носія «%s»"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "немає файла synthesis для носія «%s»"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "немає файла xml-info для носія «%s»"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2059,7 +2090,8 @@ msgstr "  --noclean      — не стирати rpm з кешу.\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  — примусове встановлення вже встановлених пакунків.\n"
 
 #: ../urpmi:104
@@ -2128,7 +2160,8 @@ msgstr "  --wget-options — додаткові параметри, які сл�
 #: ../urpmi:121
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
-msgstr "  --prozilla-options — додаткові параметри, які слід передати prozilla\n"
+msgstr ""
+"  --prozilla-options — додаткові параметри, які слід передати prozilla\n"
 
 #: ../urpmi:122
 #, c-format
@@ -2194,7 +2227,8 @@ msgstr "  --ignoresize   — не перевіряти місце на диск�
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   — дозволити встановлення rpm для невідповідних архітектур.\n"
+msgstr ""
+"  --ignorearch   — дозволити встановлення rpm для невідповідних архітектур.\n"
 
 #: ../urpmi:140
 #, c-format
@@ -2233,7 +2267,8 @@ msgstr "  --nolock       — не блокувати базу даних rpm.\n"
 #: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  — поновити тільки пакунки з такою самою архітектурою.\n"
+msgstr ""
+"  --strict-arch  — поновити тільки пакунки з такою самою архітектурою.\n"
 
 #: ../urpmi:149 ../urpmq:97
 #, c-format
@@ -2258,7 +2293,8 @@ msgstr "  назви або rpm-файли, задані в командному
 #: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Помилка: не можна використовувати --auto-select лише зі списком пакунків.\n"
+msgstr ""
+"Помилка: не можна використовувати --auto-select лише зі списком пакунків.\n"
 
 #: ../urpmi:190
 #, c-format
@@ -2289,7 +2325,8 @@ msgstr "типовим є --buildrequires"
 
 #: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "будь ласка, скористайтеся --buildrequires або --install-src, типовим є --"
 "buildrequires"
@@ -2317,48 +2354,44 @@ msgstr ""
 "Помилка: схоже, %s змонтовано в режимі тільки читання.\n"
 "Використовуйте --allow-force, щоб виконати цю дію."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Оновлення носія...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (для оновлення)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (для оновлення)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (для встановлення)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (для встановлення)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
-msgstr "Щоб задовольнити залежність «%s», слід встановити один з таких пакунків:"
+msgstr ""
+"Щоб задовольнити залежність «%s», слід встановити один з таких пакунків:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Що оберете? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2369,7 +2402,7 @@ msgstr ""
 "від пакунків, які є старішими від встановлених:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2380,7 +2413,7 @@ msgstr ""
 "від пакунків, які є старішими від встановлених:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2389,12 +2422,12 @@ msgstr ""
 "\n"
 "Продовжувати встановлення за будь-яких умов?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (Т/н) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2403,7 +2436,7 @@ msgstr ""
 "Замовлений пакунок не може бути встановлено:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2412,12 +2445,12 @@ msgstr ""
 "Деякі із замовлених пакунків неможливо встановити:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "вилучення пакунка %s пошкодить систему"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2428,7 +2461,7 @@ msgstr ""
 "слід вилучити для того, щоб поновити інші:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2439,12 +2472,12 @@ msgstr ""
 "бути вилучені для того, щоб поновити інші:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(лише для перевірки, вилучення проводитися не буде)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2455,7 +2488,7 @@ msgstr ""
 "встановити такі залежності:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2463,27 +2496,27 @@ msgstr[0] "Наведений нижче «осиротілий» пакунок
 msgstr[1] "Наведені нижче «осиротілі» пакунки буде вилучено."
 msgstr[2] "Наведені нижче «осиротілі» пакунки буде вилучено."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(лише для перевірки, встановлення проводитися не буде)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Буде використано %s додаткового місця на диску."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Буде звільнено %s місця на диску."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Буде отримано %s пакунків."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2491,12 +2524,12 @@ msgstr[0] "Продовжити встановлення %d пакунка?"
 msgstr[1] "Продовжити встановлення %d пакунків?"
 msgstr[2] "Продовжити встановлення %d пакунків?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Натисніть Enter, коли змонтуєте..."
@@ -2548,12 +2581,14 @@ msgstr ""
 #: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         — використовувати wget для доступу до віддалених файлів.\n"
+msgstr ""
+"  --wget         — використовувати wget для доступу до віддалених файлів.\n"
 
 #: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         — використовувати curl для доступу до віддалених файлів.\n"
+msgstr ""
+"  --curl         — використовувати curl для доступу до віддалених файлів.\n"
 
 #: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
@@ -2565,7 +2600,8 @@ msgstr ""
 #: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
-msgstr "  --aria2        — використовувати aria2 для отримання віддалених файлів.\n"
+msgstr ""
+"  --aria2        — використовувати aria2 для отримання віддалених файлів.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
@@ -2607,7 +2643,8 @@ msgstr "  --no-probe     — не намагатися знайти файли s
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
-msgstr "  --distrib      — автоматично створювати всі носії із носія встановлення.\n"
+msgstr ""
+"  --distrib      — автоматично створювати всі носії із носія встановлення.\n"
 
 #: ../urpmi.addmedia:75
 #, c-format
@@ -2648,7 +2685,8 @@ msgstr "  --nopubkey     — не імпортувати публічний кл
 #: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          — додати носія в конфігурацію, але не поновлювати його.\n"
+msgstr ""
+"  --raw          — додати носія в конфігурацію, але не поновлювати його.\n"
 
 #: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
@@ -2673,7 +2711,8 @@ msgstr "непотрібні аргументи до --distrib --mirrorlist <url
 #: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "помилковий <url> (для локального каталогу слід вказати абсолютний шлях)"
+msgstr ""
+"помилковий <url> (для локального каталогу слід вказати абсолютний шлях)"
 
 #: ../urpmi.addmedia:124
 #, c-format
@@ -2749,7 +2788,8 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         — показати список транзакцій з часу заданого аргументу дата/"
 "період\n"
@@ -2757,12 +2797,14 @@ msgstr ""
 #: ../urpmi.recover:38
 #, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     — показати список всіх транзакцій у базі даних rpm (довго)\n"
+msgstr ""
+"  --list-all     — показати список всіх транзакцій у базі даних rpm (довго)\n"
 
 #: ../urpmi.recover:39
 #, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
-msgstr "  --list-safe    — показати список транзакцій після контрольної точки\n"
+msgstr ""
+"  --list-safe    — показати список транзакцій після контрольної точки\n"
 
 #: ../urpmi.recover:40
 #, c-format
@@ -2955,12 +2997,12 @@ msgstr "  -ff            — примусити до оновлення synthesi
 msgid "Only superuser is allowed to update media"
 msgstr "Тільки користувачу root дозволяється поновлювати носії"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нічого поновлювати (використовуйте urpmi.addmedia, щоб додати носія)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2969,17 +3011,17 @@ msgstr ""
 "об'єкта для поновлення немає\n"
 "(один з %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "ігнорується джерело %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "джерело робиться доступним %s"
@@ -3048,8 +3090,10 @@ msgstr "  --list-aliases — вивести список доступних па
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config — вивести конфігурацію у формі аргументу urpmi.addmedia.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config — вивести конфігурацію у формі аргументу urpmi.addmedia.\n"
 
 #: ../urpmq:64
 #, c-format
@@ -3060,7 +3104,8 @@ msgstr ""
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      — вивести всі вихідні пакунки перед завантаженням (тільки "
 "root).\n"
@@ -3198,7 +3243,8 @@ msgstr ""
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
-msgstr "  -u             — пропустити пакунок, якщо новіша версія вже встановлена.\n"
+msgstr ""
+"  -u             — пропустити пакунок, якщо новіша версія вже встановлена.\n"
 
 #: ../urpmq:107
 #, c-format
@@ -3246,14 +3292,16 @@ msgstr ""
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "немає файла відомостей xml для носія «%s», не отримано жодного результату для "
 "пакунка %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "немає файла відомостей xml для носія «%s», не отримано жодного результату для "
 "пакунків %s"
@@ -3263,3 +3311,5 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Не знайдено журналу змін\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Оновлення носія...\n"
diff --git a/po/uz.po b/po/uz.po
index 59b12227..c9edd46c 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2007-09-13 16:43+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM o'rnatish"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Xato: %s fayli topilmadi, amal bekor qilinadi"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -46,7 +46,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -61,7 +61,7 @@ msgstr ""
 "\n"
 "Davom etishni istaysizmi?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -76,22 +76,22 @@ msgstr ""
 "\n"
 "Ularni o'rnatmasdan kompyuterga saqlasa ham bo'ladi. Siz nimani istaysiz?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "O'r_natish"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Saqlash"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Bekor qilish"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Faylni qaerga saqlash joyini tanlang"
@@ -194,12 +194,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Hech qanday paket ko'rsatilmagan"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Iltimos kutib turing..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "root bo'lish kerak"
@@ -230,42 +230,42 @@ msgstr ""
 "%s\n"
 "Bunga qaramasdan o'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (yangilash)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (o'rnatish)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Paket tanlovi"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Quyidagi paketlardan biri kerak:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "To'_xtatish"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -276,55 +276,62 @@ msgstr ""
 "%s\n"
 "O'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d-ta paket, %d Mb)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Tayyorlanmoqda..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" paketi olinmoqda..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...olish muvaffaqiyatsiz tugadi: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Tayyor"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -335,28 +342,27 @@ msgstr ""
 "%s\n"
 "Balki urpmi ma'lumot bazasini yangilashingiz kerak."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Hamma narsa allaqachon o'rnatilgan"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "O'rnatish tugadi"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s o'chirilmoqda"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi qaytadan ishga tushmoqda"
@@ -432,58 +438,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb'ni ochib bo'lmadi"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "RPM-faylining nomi (%s) noto'g'ri"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-fayli (%s) olinmoqda..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...olish tugadi"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...olish muvaffaqiyatsiz tugadi: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr ""
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-faylini ro'yxatdan o'tkazib bo'lmadi"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -523,22 +523,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot direktoriyasi mavjud emas"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -630,82 +630,87 @@ msgstr "%s muvaffaqiyatsiz tugadi: xato kodi %d"
 msgid "%s failed: exited with %d"
 msgstr "%s muvaffaqiyatsiz tugadi: xato kodi %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "nusxa ko'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget dasturi yetishmayapti\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl dasturi yetishmayapti\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl muvaffaqiyatsiz tugadi: yozib olish bekor qilindi\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync dasturi yetishmayapti\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh dasturi yetishmayapti\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla dasturi yetishmayapti\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "prozilla dasturini ishga tushirib bo'lmadi\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "prozilla dasturi yetishmayapti\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% bajarildi, jami = %s, ETA = %s, tezlik = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% bajarildi, tezlik = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "%s olinmoqda"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "%s olindi"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s uchun noma'lum protokol aniqlangan"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "noma'lum protokol: %s"
@@ -725,58 +730,58 @@ msgstr "%s paketi topilmadi."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM-fayllari \"%s\" to'plamidan olinmoqda..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "delta-rpm paketidan RPM-faylini ajratib bo'lmadi: %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s paketini o'rnatib bo'lmadi"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "to'plam olib tashlanmoqda: \"%s\""
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...olish muvaffaqiyatsiz tugadi: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "%s paketi olib tashlanmoqda"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "%s paketi olib tashlanmoqda"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "%s paketi haqida ko'proq ma'lumot"
@@ -821,75 +826,80 @@ msgstr "to'xtatilmoqda"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Quyidagi paketning imzosi xato"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Quyidagi paketlarning imzolari noto'g'ri"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "O'rnatishni davom etishni istaysizmi?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "to'plam olib tashlanmoqda: \"%s\""
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr ""
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "o'rnatilmoqda: %s, qaerdan: %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s o'rnatilmoqda"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
+msgstr "%s'ni o'rnatish uchun"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketlarni yangilash muhtoji yo'q"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "O'rnatish mumkin"
@@ -1100,7 +1110,7 @@ msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 "olingan hdlist (yoki synthesis) fayli uchun md5sum soni hisoblanmoqda..."
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
@@ -1140,32 +1150,32 @@ msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "'%s' uchun hdlist (yoki synthesis) fayli yozib olinmoqda..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "'%s' uchun pubkey fayli tekshirilmoqda..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "'%s' uchun pubkey faylini import qilib bo'lmadi"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "to'plam yangilandi: \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1180,94 +1190,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "RPM-fayllari %s'dan o'qilmoqda"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "JjJjNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "HhHhYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (h/Y) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Uzr, noto'g'ri tanlov. Boshqasini tanlang\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Paket"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versiya"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Reliz"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr ""
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(taklif qilingan)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "to'plam: \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "Kb"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "Mb"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "Gb"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "Tb"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1349,293 +1364,6 @@ msgstr "%s ulanmoqda"
 msgid "unmounting %s"
 msgstr "%s uzilmoqda"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf, versiya %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish: urpmf [parametrlar] qidirish uchun ifoda\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr ""
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - ko'rsatilgan, vergul bilan ajratilgan, to'plamlardan "
-"foydalanilmasin.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - ko'rsatilgan synthesis faylidan foydalanish.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - bir xil qatorlar ko'rsatilmasin.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - faqat yangilash to'plamidan foydalanish.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr ""
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr ""
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr ""
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Teglar ro'yxati:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr ""
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   masalan: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr ""
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr ""
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - paket ta'rifi\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr ""
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr ""
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - paketdagi fayllar ro'yxatini ko'rsatish\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - guruh\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr ""
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - paketning nomi\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr ""
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr ""
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr ""
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr ""
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - paket qaysi to'plamda topilganini ko'rsatish\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "to'plam uchun hdlist synthesis fayli yaratildi: \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "to'plam uchun ro'yxat fayli yozilmoqda: \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1652,7 +1380,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "%s nomli paket mavjud emas"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Quyidagi paketlarda %s bor: %s"
@@ -1662,47 +1390,47 @@ msgstr "Quyidagi paketlarda %s bor: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "%s paketlarini o'rnatib bo'lmaydi"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "%s paketi allaqachon o'rnatilgan"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "%s paketlari allaqachon o'rnatilgan"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "%s yetishmaganiga ko'ra"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "%s paketi allaqachon o'rnatilganligi uchun"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'ni qoldirish uchun"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1711,7 +1439,7 @@ msgstr ""
 "Boshqa paketlarni yangilash uchun quyidagi paketni olib tashlash kerak:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1720,12 +1448,12 @@ msgstr ""
 "Boshqa paketlarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s'ni o'rnatish uchun"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
@@ -1818,6 +1546,12 @@ msgstr ""
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1845,38 +1579,38 @@ msgstr "  --verbose, -v  - ortiqcha xabarlar bilan.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Paketlarni faqat root olib tashlashi mumkin"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "Noma'lum paketlar"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "noma'lum paket"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "O'chirish uchun hech narsa yo'q"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "O'chirish uchun hech narsa yo'q"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1884,43 +1618,318 @@ msgid_plural ""
 msgstr[0] ""
 "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "noma'lum paket"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%d-ta paketni olib tashlashni istaysizmi?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (h/Y) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "O'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "O'chirish muvaffaqiyatsiz tugadi"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf, versiya %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+"\n"
+"Foydalanish: urpmf [parametrlar] qidirish uchun ifoda\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr ""
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - ko'rsatilgan, vergul bilan ajratilgan, to'plamlardan "
+"foydalanilmasin.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - ko'rsatilgan synthesis faylidan foydalanish.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - bir xil qatorlar ko'rsatilmasin.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - faqat yangilash to'plamidan foydalanish.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr ""
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr ""
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr ""
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Teglar ro'yxati:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr ""
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   masalan: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr ""
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr ""
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - paket ta'rifi\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr ""
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr ""
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - paketdagi fayllar ro'yxatini ko'rsatish\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - guruh\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr ""
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - paketning nomi\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr ""
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr ""
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr ""
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr ""
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - paket qaysi to'plamda topilganini ko'rsatish\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "to'plam uchun hdlist synthesis fayli yaratildi: \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "to'plam uchun ro'yxat fayli yozilmoqda: \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2238,48 +2247,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "To'plam yangilanmoqda...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (yangilash)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (yangilash)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (o'rnatish)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (o'rnatish)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "'%s' bog'liqlikni ta'minlash uchun quyidagi paketlardan bittasi kerak:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Nimani tanlaysiz? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2290,7 +2294,7 @@ msgstr ""
 "paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2301,7 +2305,7 @@ msgstr ""
 "paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2310,12 +2314,12 @@ msgstr ""
 "\n"
 "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (H/y) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2324,7 +2328,7 @@ msgstr ""
 "Talab qilingan paketni o'rnatib bo'lmaydi:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2333,12 +2337,12 @@ msgstr ""
 "Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2349,7 +2353,7 @@ msgstr ""
 "uchun quyidagi paketni olib tashlash kerak:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2360,12 +2364,12 @@ msgstr ""
 "uchun quyidagi paketlarni olib tashlash kerak:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(sinov usuli, hech narsa olib tashlanmaydi)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2375,45 +2379,45 @@ msgstr ""
 "Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] ""
 "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(sinov usuli, hech narsa o'rnatilmaydi)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Diskda qo'shimcha %s joy ishlatiladi."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
@@ -2852,14 +2856,14 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Faqat boshqaruvchi (root ) to'plami yangilashi mumkin"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "yangilash uchun hech narsa yo'q (to'plamni qo'shish uchun\n"
 "urpmi.addmedia buyrug'idan foydalaning)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2868,17 +2872,17 @@ msgstr ""
 "yangilash parametri yetishmayapti\n"
 "(quyidagilardan bittasi: %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "to'plamga e'tibor berilmaydi: \"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr ""
@@ -3136,6 +3140,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Changelog fayli topilmadi\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "To'plam yangilanmoqda...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "%s fayli tekshirilmoqda"
 
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index f94fc154..98b0c382 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2007-09-13 16:43+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM ўрнатиш"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Хато: %s файли топилмади, амал бекор қилинади"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Ок"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -46,7 +46,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -61,7 +61,7 @@ msgstr ""
 "\n"
 "Давом этишни истайсизми?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -76,22 +76,22 @@ msgstr ""
 "\n"
 "Уларни ўрнатмасдан компьютерга сақласа ҳам бўлади. Сиз нимани истайсиз?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "Ўр_натиш"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Сақлаш"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Бекор қилиш"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Файлни қаерга сақлаш жойини танланг"
@@ -192,12 +192,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Ҳеч қандай пакет кўрсатилмаган"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Илтимос кутиб туринг..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "root бўлиш керак"
@@ -228,42 +228,42 @@ msgstr ""
 "%s\n"
 "Бунга қарамасдан ўрнатишни давом эттиришни истайсизми?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Диққат"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (янгилаш)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (ўрнатиш)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Пакет танлови"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Қуйидаги пакетлардан бири керак:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "Тў_хтатиш"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -274,55 +274,62 @@ msgstr ""
 "%s\n"
 "Ўрнатишни давом эттиришни истайсизми?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d-та пакет, %d Мб)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Тайёрланмоқда..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Илтимос \"%s\" номли тўпламни [%s] ускунасига қўйинг"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" пакети олинмоқда..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...олиш муваффақиятсиз тугади: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Тайёр"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -333,28 +340,27 @@ msgstr ""
 "%s\n"
 "Балки urpmi маълумот базасини янгилашингиз керак."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Ўрнатиш муваффақиятсиз тугади:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Ҳамма нарса аллақачон ўрнатилган"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Ўрнатиш тугади"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s ўчирилмоқда"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi қайтадан ишга тушмоқда"
@@ -430,58 +436,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb'ни очиб бўлмади"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "RPM-файлининг номи (%s) нотўғри"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-файли (%s) олинмоқда..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...олиш тугади"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...олиш муваффақиятсиз тугади: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr ""
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-файлини рўйхатдан ўтказиб бўлмади"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -521,22 +521,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot директорияси мавжуд эмас"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s амалидан %s амалисиз фойдаланиб бўлмайди"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -628,82 +628,87 @@ msgstr "%s муваффақиятсиз тугади: хато коди %d"
 msgid "%s failed: exited with %d"
 msgstr "%s муваффақиятсиз тугади: хато коди %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "нусха кўчириш муваффақиятсиз тугади"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget дастури етишмаяпти\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl дастури етишмаяпти\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl муваффақиятсиз тугади: ёзиб олиш бекор қилинди\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync дастури етишмаяпти\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh дастури етишмаяпти\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla дастури етишмаяпти\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "prozilla дастурини ишга тушириб бўлмади\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "prozilla дастури етишмаяпти\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% бажарилди, жами = %s, ETA = %s, тезлик = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% бажарилди, тезлик = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "%s олинмоқда"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "%s олинди"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s учун номаълум протокол аниқланган"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "номаълум протокол: %s"
@@ -723,58 +728,58 @@ msgstr "%s пакети топилмади."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM-файллари \"%s\" тўпламидан олинмоқда..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "delta-rpm пакетидан RPM-файлини ажратиб бўлмади: %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s пакетини ўрнатиб бўлмади"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "тўплам олиб ташланмоқда: \"%s\""
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...олиш муваффақиятсиз тугади: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "%s пакети олиб ташланмоқда"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "%s пакети олиб ташланмоқда"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "%s пакети ҳақида кўпроқ маълумот"
@@ -819,75 +824,80 @@ msgstr "тўхтатилмоқда"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Ўрнатиш муваффақиятсиз тугади:"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Қуйидаги пакетнинг имзоси хато"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ўрнатишни давом этишни истайсизми?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "тўплам олиб ташланмоқда: \"%s\""
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr ""
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "ўрнатилмоқда: %s, қаердан: %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s ўрнатилмоқда"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Боғлиқликларни текширмасдан ўрнатиб кўрайми? (ҳ/Й) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
+msgstr "%s'ни ўрнатиш учун"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Пакетларни янгилаш муҳтожи йўқ"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Ўрнатиш мумкин"
@@ -1094,7 +1104,7 @@ msgstr ""
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "олинган hdlist (ёки synthesis) файли учун md5sum сони ҳисобланмоқда..."
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "%s'дан нусха кўчириш муваффақиятсиз тугади (md5sum нотўғри)"
@@ -1134,32 +1144,32 @@ msgstr "тўплам учун ҳеч қандай hdlist файли топилм
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "'%s' учун hdlist (ёки synthesis) файли ёзиб олинмоқда..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "'%s' учун pubkey файли текширилмоқда..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "'%s' учун pubkey файлини импорт қилиб бўлмади"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "тўплам янгиланди: \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1174,94 +1184,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "RPM-файллари %s'дан ўқилмоқда"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "ЖжJjNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ҲҳHhYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (ҳ/Й) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Узр, нотўғри танлов. Бошқасини танланг\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Пакет"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Версия"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Релиз"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr ""
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(таклиф қилинган)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "тўплам: \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "Б"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "Кб"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "Мб"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "Гб"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "Тб"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1343,293 +1358,6 @@ msgstr "%s уланмоқда"
 msgid "unmounting %s"
 msgstr "%s узилмоқда"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf, версия %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
-"\n"
-"Фойдаланиш: urpmf [параметрлар] қидириш учун ифода\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr ""
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - кўрсатилган, вергул билан ажратилган, тўпламлардан "
-"фойдаланилмасин.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - кўрсатилган synthesis файлидан фойдаланиш.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - бир хил қаторлар кўрсатилмасин.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - фақат янгилаш тўпламидан фойдаланиш.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - ортиқча хабарлар билан.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr ""
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr ""
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr ""
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Тэглар рўйхати:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr ""
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   масалан: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr ""
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr ""
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - пакет таърифи\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr ""
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr ""
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - пакетдаги файллар рўйхатини кўрсатиш\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - гуруҳ\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr ""
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - пакетнинг номи\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr ""
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr ""
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr ""
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr ""
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - пакет қайси тўпламда топилганини кўрсатиш\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "тўплам учун hdlist synthesis файли яратилди: \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "тўплам учун рўйхат файли ёзилмоқда: \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1646,7 +1374,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "%s номли пакет мавжуд эмас"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Қуйидаги пакетларда %s бор: %s"
@@ -1656,47 +1384,47 @@ msgstr "Қуйидаги пакетларда %s бор: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "%s пакетларини ўрнатиб бўлмайди"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "%s пакети аллақачон ўрнатилган"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "%s пакетлари аллақачон ўрнатилган"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "%s етишмаганига кўра"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "%s пакети аллақачон ўрнатилганлиги учун"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'ни қолдириш учун"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1705,7 +1433,7 @@ msgstr ""
 "Бошқа пакетларни янгилаш учун қуйидаги пакетни олиб ташлаш керак:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1714,12 +1442,12 @@ msgstr ""
 "Бошқа пакетларни янгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "%s'ни ўрнатиш учун"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
@@ -1810,6 +1538,12 @@ msgstr ""
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1837,81 +1571,356 @@ msgstr "  --verbose, -v  - ортиқча хабарлар билан.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Пакетларни фақат root олиб ташлаши мумкин"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "Номаълум пакетлар"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "номаълум пакет"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "пакетни (%s) олиб ташлаш тизимни ишдан чиқаради"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ўчириш учун ҳеч нарса йўқ"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Ўчириш учун ҳеч нарса йўқ"
 
-#: ../urpme:149
+#: ../urpme:151
 #, 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] "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "номаълум пакет"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%d-та пакетни олиб ташлашни истайсизми?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (ҳ/Й) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Ўчириш муваффақиятсиз тугади"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Ўчириш муваффақиятсиз тугади"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf, версия %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
+"\n"
+"Фойдаланиш: urpmf [параметрлар] қидириш учун ифода\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr ""
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - кўрсатилган, вергул билан ажратилган, тўпламлардан "
+"фойдаланилмасин.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - кўрсатилган synthesis файлидан фойдаланиш.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - бир хил қаторлар кўрсатилмасин.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - фақат янгилаш тўпламидан фойдаланиш.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - ортиқча хабарлар билан.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr ""
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr ""
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr ""
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Тэглар рўйхати:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr ""
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   масалан: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr ""
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr ""
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - пакет таърифи\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr ""
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr ""
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - пакетдаги файллар рўйхатини кўрсатиш\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - гуруҳ\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr ""
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - пакетнинг номи\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr ""
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr ""
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr ""
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr ""
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - пакет қайси тўпламда топилганини кўрсатиш\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "тўплам учун hdlist synthesis файли яратилди: \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "тўплам учун рўйхат файли ёзилмоқда: \"%s\""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2229,48 +2238,43 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Тўплам янгиланмоқда...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (янгилаш)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (янгилаш)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (ўрнатиш)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (ўрнатиш)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "'%s' боғлиқликни таъминлаш учун қуйидаги пакетлардан биттаси керак:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Нимани танлайсиз? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2281,7 +2285,7 @@ msgstr ""
 "пакетлардан кўра эскироқ пакетларга боғлиқ:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2292,7 +2296,7 @@ msgstr ""
 "пакетлардан кўра эскироқ пакетларга боғлиқ:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2301,12 +2305,12 @@ msgstr ""
 "\n"
 "Бунга қарамасдан давом этишни истайсизми?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Ҳ/й) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2315,7 +2319,7 @@ msgstr ""
 "Талаб қилинган пакетни ўрнатиб бўлмайди:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2324,12 +2328,12 @@ msgstr ""
 "Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "пакетни (%s) олиб ташлаш тизимни ишдан чиқаради"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2340,7 +2344,7 @@ msgstr ""
 "учун қуйидаги пакетни олиб ташлаш керак:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2351,12 +2355,12 @@ msgstr ""
 "учун қуйидаги пакетларни олиб ташлаш керак:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(синов усули, ҳеч нарса олиб ташланмайди)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2366,44 +2370,44 @@ msgstr ""
 "Қуйидаги боғлиқликларни ўрнатиш учун сиз root бўлишингиз керак:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(синов усули, ҳеч нарса ўрнатилмайди)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Дискда қўшимча %s жой ишлатилади."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Дискда %s жой бўшатилади."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Дискда %s жой бўшатилади."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "%d-та пакетни ўрнатиш билан давом этишни истайсизми?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Тайёр бўлганда ENTER тугмасини босинг..."
@@ -2839,14 +2843,14 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Фақат бошқарувчи (root ) тўплами янгилаши мумкин"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "янгилаш учун ҳеч нарса йўқ (тўпламни қўшиш учун\n"
 "urpmi.addmedia буйруғидан фойдаланинг)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2855,17 +2859,17 @@ msgstr ""
 "янгилаш параметри етишмаяпти\n"
 "(қуйидагилардан биттаси: %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "тўпламга эътибор берилмайди: \"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr ""
@@ -3122,6 +3126,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Changelog файли топилмади\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Тўплам янгиланмоқда...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "%s файли текширилмоқда"
 
diff --git a/po/vi.po b/po/vi.po
index 35ecb174..4431938b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2005-06-08 15:13+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Cài đặt RPM"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -51,7 +51,7 @@ msgstr ""
 "\n"
 "Bạn muốn làm gì?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "Thực hiện cài đặt?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -81,22 +81,22 @@ msgstr ""
 "\n"
 "Bạn có thể chỉ muốn lưu nó. Bạn chọn làm việc gì?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Cài đặt"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Lưu"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "Bỏ _qua"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Chọn nơi lưu tập tin"
@@ -200,12 +200,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "không có gói tin với tên %s"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Hãy chờ..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Phải là root"
@@ -236,42 +236,42 @@ msgstr ""
 "%s\n"
 "Tiếp tục?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr "(để nâng cấp)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr "(để cài đặt)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Cần một gói trong các gói tin sau đây:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "Hủy _bỏ"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -282,55 +282,62 @@ msgstr ""
 "%s\n"
 "Tiếp tục?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Để thỏa mãn phụ thuộc, gói tin sau đây sẽ được cài đặt (%d MB)"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Để thỏa mãn phụ thuộc, gói tin sau đây sẽ được cài đặt (%d MB)"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d các gói, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "không thể lấy các gói nguồn, hủy bỏ"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Đang chuẩn bị..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Đang cài đặt gói `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Đang tải về gói `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...không thu thập được: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "H_oàn thành"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -341,28 +348,27 @@ msgstr ""
 "%s\n"
 "Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Cài đặt không được"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Mọi thứ đã được cài đặt rồi"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Kết thúc cài đặt"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "gỡ bỏ %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "khởi chạy lại urpmi"
@@ -436,58 +442,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "đang dùng môi trường đặc hiệu trên %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "không thể mở rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "tên tập tin rpm [%s] không hợp lệ"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "đang thu thập tập tin rpm [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...hoàn thành việc thu thập"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...không thu thập được: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "không thể truy cập tập tin rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "không thể phân tích cú pháp \"%s\" trong tập tin [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "không thể đăng ký tập tin rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "lỗi đăng ký các gói tin cục bộ"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -527,22 +527,22 @@ msgstr ""
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -634,82 +634,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Sao chép không được"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "do thiếu %s"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "do thiếu %s"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "do thiếu %s"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "gỡ bỏ %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...không thu thập được: %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "chỉ định giao thức không xác định cho %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "không thấy webfetch nào, webfetch được hỗ trợ là: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "không thể quản lý giao thức: %s"
@@ -729,12 +734,12 @@ msgstr "Không tìm thấy gói tin %s."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "đang thu thập các tập tin rpm từ phương tiện \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -742,47 +747,47 @@ msgstr ""
 "đã tạo phiên giao dịch cho việc cài đặt trên %s (gỡ bỏ=%d, cài đặt=%d, nâng "
 "cấp=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "không thể tạo phiên giao dịch"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "không thể lấy rpm ra từ gói tin delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "không thể cài đặt gói %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "cài đặt %s từ %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...không thu thập được: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "gỡ bỏ gói %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "gỡ bỏ gói %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "cài đặt %s từ %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Thêm thông tin cho gói %s"
@@ -827,75 +832,80 @@ msgstr "Cảnh báo"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Cài đặt không được"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Cài đặt không được"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Các gói tin sau đây có các chữ ký tồi"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Các gói tin sau đây có các chữ ký tồi"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Bạn muốn tiếp tục cài đặt không ?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "cài đặt %s từ %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "phân phối %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "cài đặt %s từ %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "đang cài đặt %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Thử cài đặt mà không cần kiểm tra các phụ thuộc? (Có/Không)"
 
-#: ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:249
 #, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
+msgid "Try harder to install (--force)?"
 msgstr "Thử cố gắng cài đặt (--force)? (Có/[Không])"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Có khả năng cài đặt"
@@ -1100,7 +1110,7 @@ msgstr "lỗi sao chép [%s] (có lẽ tập tin nhỏ)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "tính toán md5sum của hdlist (hoặc synthesis) nguồn thu thập được"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Lỗi bản sao của [%s] (md5sum không so khớp)"
@@ -1140,32 +1150,32 @@ msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "đang thu thập hdlist (hoặc synthesis) nguồn của \"%s\"..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "đang kiểm tra tập tin pubkey của \"%s\"..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...đã nhập key %s từ tập tin pubkey của \"%s\""
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "không thể nhập tập tin pubkey của \"%s\""
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "đã thêm phương tiện %s"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1180,17 +1190,17 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "đang đọc các tập tin rpm từ [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "NnKk"
@@ -1200,78 +1210,83 @@ msgstr "NnKk"
 #  can hit those keys in their keyboard to reply.
 #  please keep the 'Yy' for compatibility reasons
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyVvDdCc"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (Có/Không) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Xin lỗi, lựa chọn sai, hãy thử lại\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Arch"
 msgstr "Tìm kiếm"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "gỡ bỏ phương tiện \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1353,300 +1368,6 @@ msgstr "gắn kết %s"
 msgid "unmounting %s"
 msgstr "thôi gắn kết %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, fuzzy, 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"
-msgstr ""
-"Phiên bản urpmf %s\n"
-"Bản quyền (C) 2002-2006 Mandriva.\n"
-"Đây là phần mềm miễn phí và có thể phân phối lại theo các điều khoản của GNU "
-"GPL.\n"
-"\n"
-"Cách dùng:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - in thông tin trợ giúp này.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - dùng môi trường riêng (điển hình là báo cáo lỗi).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - không dùng phương tiện được trao, ngăn cách bởi dấu "
-"phẩy.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - dùng root khác để thực hiện cài đặt rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia         - xếp loại phương tiện theo các chuỗi con được ngăn "
-"cách bởi dấu phẩy.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - dùng synthesis nhận được thay cho urpmi db.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - dùng synthesis nhận được thay cho urpmi db.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - không in ra các dòng giống nhau.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - chỉ dùng phương tiện cập nhật.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - phương thức verbose.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - bỏ qua các dấu hiệu phân biệt trong mọi mẫu.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - bỏ qua các dấu hiệu phân biệt trong mọi mẫu.\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - bao gồm mã perl trực tiếp như perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr ""
-"  -a             - binary AND operator, đúng nếu cả hai expression là đúng.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr ""
-"  -o             - binary OR operator, đúng nếu một expression là đúng.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -q             - chế độ yên lặng.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - dấu ngoặc phải để đóng group expression.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Danh sách dữ liệu để khôi phục:\n"
-"\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - dùng giao diện X.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    mặc định là %s.\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - in ra tag url: url.\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - in ra tag buildhost: build host.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Module cấu hình Konsole "
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - in ra xung đột tag: toàn bộ các xung đột.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - in ra mô tả tag: mô tả.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - in ra tag epoch: epoch.\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - chỉ in ra tên gói.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - in ra nhóm tag: nhóm.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - chỉ in ra tên gói.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - chỉ in ra tên gói.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - in ra các dòng tag: toàn bộ dòng.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - in ra tag packager: packager.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - in ra cung cấp tag: toàn bộ các cung cấp.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - in ra kích thước tag: kích thước.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - in ra tag sourcerpm: source rpm.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - in ra các dòng tag: toàn bộ dòng.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - in ra tóm tắt tag: tóm tắt.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - in ra tag url: url.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - phương thức verbose.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - in phiên bản, phát hành và arch với tên.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "build tập tin tổng hợp hdlist cho phương tiện \"%s\""
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1663,7 +1384,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Không có gói tin với tên %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Các gói tin sau đây chứa %s: %s"
@@ -1673,47 +1394,47 @@ msgstr "Các gói tin sau đây chứa %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Mọi thứ đã được cài đặt rồi"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Mọi thứ đã được cài đặt rồi"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Mọi thứ đã được cài đặt rồi"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "do thiếu %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Mọi thứ đã được cài đặt rồi"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vì không thỏa mãn %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "thử xúc tiến %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "để giữ %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1722,7 +1443,7 @@ msgstr ""
 "Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1731,12 +1452,12 @@ msgstr ""
 "Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "để cài đặt %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "vì xung đột với %s"
@@ -1829,6 +1550,12 @@ msgstr "  --packager     - in ra tag packager: packager.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - dùng root khác để thực hiện gỡ bỏ rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - dùng root khác để thực hiện cài đặt rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1858,81 +1585,363 @@ msgstr "  --verbose      - phương thức verbose.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - chọn toàn bộ các gói tin khớp với sự diễn đạt.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Chỉ có superuser mới được phép gỡ bỏ các gói"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "các gói tin không xác định "
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "gói tin không xác định"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "việc gỡ bỏ gói tin %s sẽ phá vỡ hệ thống"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Không có gì để gỡ bỏ"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Không có gì để gỡ bỏ"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, 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] "Để thỏa mãn các phụ thuộc, %d gói sau đây sẽ được gỡ bỏ (%d MB)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "gói tin không xác định"
 
-#: ../urpme:161
+#: ../urpme:163
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "gỡ bỏ gói %s"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (Có/Không) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "coi phương tiện tháo lắp là \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Gỡ bỏ không được"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Gỡ bỏ không được"
 
+#: ../urpmf:29
+#, fuzzy, 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"
+msgstr ""
+"Phiên bản urpmf %s\n"
+"Bản quyền (C) 2002-2006 Mandriva.\n"
+"Đây là phần mềm miễn phí và có thể phân phối lại theo các điều khoản của GNU "
+"GPL.\n"
+"\n"
+"Cách dùng:\n"
+
+#: ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - in thông tin trợ giúp này.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - dùng môi trường riêng (điển hình là báo cáo lỗi).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - không dùng phương tiện được trao, ngăn cách bởi dấu "
+"phẩy.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia         - xếp loại phương tiện theo các chuỗi con được ngăn "
+"cách bởi dấu phẩy.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - dùng synthesis nhận được thay cho urpmi db.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - dùng synthesis nhận được thay cho urpmi db.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - không in ra các dòng giống nhau.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - chỉ dùng phương tiện cập nhật.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - phương thức verbose.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - bỏ qua các dấu hiệu phân biệt trong mọi mẫu.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - bỏ qua các dấu hiệu phân biệt trong mọi mẫu.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - bao gồm mã perl trực tiếp như perl -e.\n"
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr ""
+"  -a             - binary AND operator, đúng nếu cả hai expression là đúng.\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr ""
+"  -o             - binary OR operator, đúng nếu một expression là đúng.\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -q             - chế độ yên lặng.\n"
+
+#: ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - dấu ngoặc phải để đóng group expression.\n"
+
+#: ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Danh sách dữ liệu để khôi phục:\n"
+"\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - dùng giao diện X.\n"
+
+#: ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    mặc định là %s.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - in ra tag url: url.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - in ra tag buildhost: build host.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Module cấu hình Konsole "
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - in ra xung đột tag: toàn bộ các xung đột.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - in ra mô tả tag: mô tả.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - in ra tag epoch: epoch.\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - chỉ in ra tên gói.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - in ra nhóm tag: nhóm.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - chỉ in ra tên gói.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - chỉ in ra tên gói.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - in ra các dòng tag: toàn bộ dòng.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - in ra tag packager: packager.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - in ra cung cấp tag: toàn bộ các cung cấp.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
+
+#: ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - in ra kích thước tag: kích thước.\n"
+
+#: ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - in ra tag sourcerpm: source rpm.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - in ra các dòng tag: toàn bộ dòng.\n"
+
+#: ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - in ra tóm tắt tag: tóm tắt.\n"
+
+#: ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - in ra tag url: url.\n"
+
+#: ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - phương thức verbose.\n"
+
+#: ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - in phiên bản, phát hành và arch với tên.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "build tập tin tổng hợp hdlist cho phương tiện \"%s\""
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2278,48 +2287,43 @@ msgstr ""
 "Lỗi: %s được mount là read-only.\n"
 "Dùng --allow-force để ép hoạt động."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr ""
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "(để nâng cấp)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "(để nâng cấp)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "(để cài đặt)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "(để cài đặt)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Để thỏa mãn các phụ thuộc, %d gói sau đây sẽ được gỡ bỏ (%d MB)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Bạn lựa chọn gì? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2330,7 +2334,7 @@ msgstr ""
 "gói cũ hơn các gói đã cài đặt:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2341,19 +2345,19 @@ msgstr ""
 "gói cũ hơn các gói đã cài đặt:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Vẫn tiếp tục bằng bất cứ giá nào?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Có/Không) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2362,7 +2366,7 @@ msgstr ""
 "Không thể cài đặt một số gói tin được yêu cầu:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2371,12 +2375,12 @@ msgstr ""
 "Không thể cài đặt một số gói tin được yêu cầu:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "việc gỡ bỏ gói tin %s sẽ phá vỡ hệ thống"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2387,7 +2391,7 @@ msgstr ""
 "để nâng cấp các gói khác:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2398,12 +2402,12 @@ msgstr ""
 "để nâng cấp các gói khác:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2413,44 +2417,44 @@ msgstr ""
 "Bạn phải là root để cài đặt các phụ thuộc sau đây:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Để thỏa mãn các phụ thuộc, %d gói sau đây sẽ được gỡ bỏ (%d MB)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Nhấn Enter khi sẵn sàng ..."
@@ -2895,12 +2899,12 @@ msgstr "  -f             - cố tạo các tập tin hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Chỉ có người dùng cao cấp được phép cập nhật phương tiện"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "Không có gì để cập nhật (dùng urpmi.addmedia để thêm phương tiện)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2909,17 +2913,17 @@ msgstr ""
 "thiếu mục cập nhật\n"
 "(một mục của %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "bỏ qua phương tiện %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "bật chạy phương tiện %s"
diff --git a/po/wa.po b/po/wa.po
index 751efc34..5de1af70 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2004-08-08 20:26+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -22,22 +22,22 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "Astalaedje do pacaedje"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Aroke: dji n' a savou trover l' fitchî %s, dj' arestêye l' operåcion"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "'l est bon"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "Cwè voloz vs fé?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Estoz vs d' acoird?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -88,22 +88,22 @@ msgstr ""
 "\n"
 "Motoit vos vloz djusse li schaper. Cwè tchoezixhoz vs?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Astaler"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Schaper"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Rinoncî"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Tchoezixhoz l' plaece wice schaper l' fitchî"
@@ -215,12 +215,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Nou pacaedje di scpecifyî"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Tårdjîz on pô s' i vos plait..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Vos dvoz esse root"
@@ -251,42 +251,42 @@ msgstr ""
 "%s\n"
 "Continouwer tot l' minme avou l' astalaedje?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Adviertixhmint"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "'l est bon"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (a mete a djoû)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (a-z astaler)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Tchoezixhaedje des pacaedjes"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Rinoncî"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -298,56 +298,63 @@ msgstr ""
 "%s\n"
 "Continouwer tot l' minme avou l' astalaedje?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Po satisfyî les aloyaedjes, li pacaedje aloyî ki shût va esse astalé:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Po satisfyî les aloyaedjes, les pacaedjes shuvants vont esse astalés"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pacaedje, %d Mo)"
 msgstr[1] "(%d pacaedjes, %d Mo)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "dji n' a savou prinde les pacaedjes sourdants, dji lai toumer"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Dj' aprestêye..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "S' i vs plait metoz li sopoirt lomé «%s» el éndjin [%s]"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Dj' aberwetêye li pacaedje «%s»..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...l' aberwetaedje a fwait berwete: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Fwait"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -358,28 +365,27 @@ msgstr ""
 "%s\n"
 "Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "L' astalåcion a fwait berwete:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "tot a ddja stî astalé"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "L' astalåcion a fini"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "dji oistêye li pacaedje %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "renondant urpmi"
@@ -454,58 +460,52 @@ msgstr ""
 msgid "using specific environment on %s\n"
 msgstr "eployant on evironmint specifike so %s\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "dji n' sai drovi l' båze rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "no d' fitchî rpm nén valåbe [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "aberwetaedje di fitchî rpm [%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...l' aberwetaedje a stî comifåt"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...l' aberwetaedje a fwait berwete: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "dji n' sai aveur accès å fitchî rpm [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "dji n' sai analijhî l' fitchî spec «%s» [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "dji n' sai redjîstrer l' fitchî rpm"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Årtchitecteure nén copatibe pol rpm [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "åk n' a nén stî tot-z eredjistrant les pacaedjes locås"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ciste operåcion ci n' est nén possibe e môde rastrindou"
@@ -545,22 +545,22 @@ msgstr "Patrons po les ratourneures:\n"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Dji n' sai eployî %s sins %s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Dji n' sai eployî %s avou %s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Pår trop d' årgumints\n"
@@ -652,82 +652,87 @@ msgstr "%s a fwait berwete: sinå di rexhowe %d"
 msgid "%s failed: exited with %d"
 msgstr "%s a fwait berwete: côde di rexhowe %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "li copiaedje a fwait berwete"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget n' est nén la\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl n' est nén la\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl a fwait berwete: aberwetaedje nén fwait\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync n' est nén la\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh n' est nén la\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla n' est nén la\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Dji n' sai enonder prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "prozilla n' est nén la\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% di %s di fwait, ETA = %s, radisté = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% di fwait, radisté = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "prindant %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "%s a stî pris"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocole nén cnoxhou defini po %s"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nou aberweteu waibe di trové, les cis sopoirtés sont: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "dji n' sai manaedjî l' protocole: %s"
@@ -747,12 +752,12 @@ msgstr "li pacaedje %s n' a nén stî trové."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "aberwetaedje des fitchîs rpms do sopoirt «%s»..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -760,47 +765,47 @@ msgstr ""
 "ahivé ene transaccion po l' astalaedje so %s (oister=%d, astaler=%d, mete a "
 "djoû=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "dji n' sai ahiver ene transaccion"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "dji n' sai saetchî èn rpm foû do pacaedje delta-rpm %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "dji n' sai astaler l' pacaedje %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "oistaedje des rpms astalés (%s) a pårti di %s"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...l' aberwetaedje a fwait berwete: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "dji oistêye li pacaedje %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "dji oistêye li pacaedje %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "oistaedje des rpms astalés (%s) a pårti di %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Pus di racsegnes sol pacaedje %s"
@@ -845,75 +850,80 @@ msgstr "Adviertixhmint"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "L' astalåcion a fwait berwete"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "L' astalåcion a fwait berwete:"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Li pacaedje ki shût a-st ene mwaijhe sinateure"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Voloz vs continouwer avou l' astalaedje?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "oistaedje des rpms astalés (%s) a pårti di %s"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "dji distribouwe %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "dj' astale %s a pårti di %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "dj' astale %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Les pacaedjes sont-st a djoû"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "L' astalaedje est possibe"
@@ -1127,7 +1137,7 @@ msgstr ""
 "dji carcule li md5sum do fitchî «hdlist» (ou del sinteze) ki vént d' esse "
 "aberweté"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "li copeye di [%s] a fwait berwete (li md5sum ni corespond nén)"
@@ -1167,32 +1177,32 @@ msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "corwaitaedje do fitchî avou l' clé publike da «%s»..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...aberwetaedje del clé %s do fitchî di clés publikes da «%s»"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "dji n' sai aberweter li clé publike da «%s»"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "sopoirt «%s» metou a djoû"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1207,94 +1217,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "lijhant les fitchîs rpm foû di [%s]"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "OoAaYyWw"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (o/N) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Mwaijhe tchuze, sayîz co ene feye\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, fuzzy, c-format
 msgid "Package"
 msgstr "Tchoezixhaedje des pacaedjes"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr ""
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr ""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, fuzzy, c-format
 msgid "medium \"%s\""
 msgstr "radjoutaedje do sopoirt «%s»"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1377,313 +1392,6 @@ msgstr "dji monte %s"
 msgid "unmounting %s"
 msgstr "dji dismonte %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf modêye %s\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"Çouci est on libe programe et pout esse cossemé so les termes del licince "
-"GPL.\n"
-"\n"
-"Po s' è siervi: urpmf [tchuzes] erîlêye-ratourneure\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - mostere li modêye do programe.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - eployî on evironmint dné (tipike po les rapoirts di "
-"bug).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - èn nén eployî les dnés sopoirts, separés pa des comas.\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - nén ene erîlêye ratourneure, mins ene tchinne literåle.\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - eployî ene ôte raecene po l' astalaedje des rpm.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - relére les sopoirts sorlon les tchinnes dinêyes, "
-"separêyes pa des comas.\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
-"                   båze di dnêyes d' urpmi.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
-"                   båze di dnêyes d' urpmi.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr ""
-"  --uniq         - èn nén håyner deus côps les royes ki sont les minmes.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - eployî kel sopoirt di metaedje a djoû.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - môde badjawe.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - èn nén fé di diferince pititès/grandès letes.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - fé l' diferince pititès/grandès letes (prémetou).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<car>        - candjî l' separateur di tchamps (prémetou «:»).\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Patrons po les ratourneures:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  tecse          - on tecse est veyou come ene erîlêye ratourneure,\n"
-"                   a moens ki l' paramete «-l» soeye eployî.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - sititchî do côde perl directumint, come «perl -e».\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operateur binaire EYET.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operateur binaire OU.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - operateur unaire NENI.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-"  ( )            - åtchetes (hintche/droete) po grouper des ratourneures.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Djivêye des etiketes:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf            - definixh ene cogne di rexhowe a môde di printf.\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   egzimpe: «%%name:%%files»\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - årtchitecteure\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - lodjoe wice ki l' pacaedje a stî fwait.\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - date ey eure ki l' pacaedje a stî fwait\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - djivêye des fitchîs d' apontiaedje\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - les conflits avou ds ôtes pacaedjes ou modêyes.\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - longou discrijhaedje do pacaedje.\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - li distribucion ki l' pacaedje a stî fwait po.\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - etikete «epoch»\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - li no d' fitchî do pacaedje.\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - djivêye des fitchîs å dvins do pacaedje\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - li groupe do pacaedje.\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - li no do pacaedje.\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - li no do pacaedje.\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-"  --obsoletes    - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
-"chal.\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - li ci k' a fwait l' pacaedje.\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - tot çou k' est ahessî på pacaedje.\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - tot çou k' i gn a mezåjhe po l' pacaedje.\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - li grandeu sol deure plake on côp astalé.\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - no do fitchî src.rpm sourdant.\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-"  --obsoletes    - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
-"chal.\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - discrijhaedje rascourti.\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - hårdêye avou des informåcions.\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - vindeu do pacaedje.\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - li sopoirt wice ki l' pacaedje a stî trové\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - mostere li modêye et release, eyet l' årtchitecteure avou "
-"l' no.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-"Cogne nén comifåt: vos n' poloz eployî k' ene seule etike multi-valixhances"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "dji fwai li fitchî d' sinteze hdlist pol sopoirt «%s»"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1700,7 +1408,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Nou pacaedje lomé %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
@@ -1710,47 +1418,47 @@ msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Les pacaedjes %s èn polèt nén esse astalés"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Li pacaedje %s a ddja stî astalé"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Les pacaedjes %s ont ddja stî astalés"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "cåze di %s ki n' est nén la"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Li pacaedje %s a ddja stî astalé"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "cåze di %s ki n' est nén satisfyî"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "dji saye di promouvwer %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "po wårder %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1759,7 +1467,7 @@ msgstr ""
 "Li pacaedje shuvant a mezåjhe d' esse oisté po des ôtes esse metous a djoû:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1769,12 +1477,12 @@ msgstr ""
 "djoû:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "po-z astaler %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "cåze di conflits avou %s"
@@ -1869,6 +1577,12 @@ msgstr "  --repackage    - Rifé l' pacaedje divant d' disfacer.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - eployî ene ôte raecene po l' oistaedje des rpm.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - eployî ene ôte raecene po l' astalaedje des rpm.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1900,39 +1614,39 @@ msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - tchoezi tos les pacaedjes ki corespondèt al ratourneure.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Seulmint li super-uzeu a l' droet d' oister des pacaedjes"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "pacaedjes nén cnoxhous"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "pacaedje nén cnoxhou"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "oister li pacaedje %s va spiyî vosse sistinme"
 msgstr[1] "oister li pacaedje %s va spiyî vosse sistinme"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Rén a oister"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Rén a oister"
 
-#: ../urpme:149
+#: ../urpme:151
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1944,45 +1658,340 @@ msgstr[1] ""
 "Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
 "(%d Mo)"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "pacaedje nén cnoxhou"
 msgstr[1] "pacaedje nén cnoxhou"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Oister %d pacaedje?"
 msgstr[1] "Oister %d pacaedjes?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (o/N) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "dji prind li bodjåve sopoirt come «%s»"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Li oistaedje a fwait berwete"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Li oistaedje a fwait berwete"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf modêye %s\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"Çouci est on libe programe et pout esse cossemé so les termes del licince "
+"GPL.\n"
+"\n"
+"Po s' è siervi: urpmf [tchuzes] erîlêye-ratourneure\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - mostere li modêye do programe.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - eployî on evironmint dné (tipike po les rapoirts di "
+"bug).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - èn nén eployî les dnés sopoirts, separés pa des comas.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - nén ene erîlêye ratourneure, mins ene tchinne literåle.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - relére les sopoirts sorlon les tchinnes dinêyes, "
+"separêyes pa des comas.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
+"                   båze di dnêyes d' urpmi.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
+"                   båze di dnêyes d' urpmi.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr ""
+"  --uniq         - èn nén håyner deus côps les royes ki sont les minmes.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - eployî kel sopoirt di metaedje a djoû.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - môde badjawe.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - èn nén fé di diferince pititès/grandès letes.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - fé l' diferince pititès/grandès letes (prémetou).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<car>        - candjî l' separateur di tchamps (prémetou «:»).\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Patrons po les ratourneures:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  tecse          - on tecse est veyou come ene erîlêye ratourneure,\n"
+"                   a moens ki l' paramete «-l» soeye eployî.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - sititchî do côde perl directumint, come «perl -e».\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operateur binaire EYET.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operateur binaire OU.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - operateur unaire NENI.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+"  ( )            - åtchetes (hintche/droete) po grouper des ratourneures.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Djivêye des etiketes:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf            - definixh ene cogne di rexhowe a môde di printf.\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   egzimpe: «%%name:%%files»\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - årtchitecteure\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - lodjoe wice ki l' pacaedje a stî fwait.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - date ey eure ki l' pacaedje a stî fwait\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - djivêye des fitchîs d' apontiaedje\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - les conflits avou ds ôtes pacaedjes ou modêyes.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - longou discrijhaedje do pacaedje.\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - li distribucion ki l' pacaedje a stî fwait po.\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - etikete «epoch»\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - li no d' fitchî do pacaedje.\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - djivêye des fitchîs å dvins do pacaedje\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - li groupe do pacaedje.\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - li no do pacaedje.\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - li no do pacaedje.\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+"  --obsoletes    - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
+"chal.\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - li ci k' a fwait l' pacaedje.\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - tot çou k' est ahessî på pacaedje.\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - tot çou k' i gn a mezåjhe po l' pacaedje.\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - li grandeu sol deure plake on côp astalé.\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - no do fitchî src.rpm sourdant.\n"
+
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+"  --obsoletes    - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
+"chal.\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - discrijhaedje rascourti.\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - hårdêye avou des informåcions.\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - vindeu do pacaedje.\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - li sopoirt wice ki l' pacaedje a stî trové\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - mostere li modêye et release, eyet l' årtchitecteure avou "
+"l' no.\n"
+
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Patrons po les ratourneures:\n"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Cogne nén comifåt: vos n' poloz eployî k' ene seule etike multi-valixhances"
+
+#: ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
+
+#: ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "dji fwai li fitchî d' sinteze hdlist pol sopoirt «%s»"
+
+#: ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2340,36 +2349,31 @@ msgstr ""
 "Aroke: i shonne ki %s soeye monté e môde seulmint-lére.\n"
 "Eployîz --allow-force po foircî l' operåcion."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Metant a djoû les sopoirts...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (a mete a djoû)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (a mete a djoû)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (a-z astaler)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (a-z astaler)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2378,12 +2382,12 @@ msgstr ""
 "Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
 "(%d Mo)"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ké tchoezixhoz vs? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2394,7 +2398,7 @@ msgstr ""
 "d' ôtes pacaedjes ki sont pus vîs kel ci k' est astalé:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2405,7 +2409,7 @@ msgstr ""
 "d' ôtes pacaedjes ki sont pus vîs k' les cis k' sont astalés:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2414,12 +2418,12 @@ msgstr ""
 "\n"
 "Voloz vs tot l' minme continouwer l' astalaedje?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (O/n) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2428,7 +2432,7 @@ msgstr ""
 "On pacaedje dimandé n' pout nén esse astalé:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2437,12 +2441,12 @@ msgstr ""
 "Sacwants pacaedjes dimandés n' polèt nén esse astalés:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "oister li pacaedje %s va spiyî vosse sistinme"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2453,7 +2457,7 @@ msgstr ""
 "a mezåjhe d' esse oisté po des ôtes esse metous a djoû:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2464,12 +2468,12 @@ msgstr ""
 "ont mezåjhe d' esse oistés po des ôtes esse metous a djoû:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(c' est seulmint ene saye, li dizastalaedje n' est nén fwait)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2479,7 +2483,7 @@ msgstr ""
 "Vos dvoz esse root po-z astaler les aloyances shuvantes:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2490,39 +2494,39 @@ msgstr[1] ""
 "Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
 "(%d Mo)"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(c' est seulmint ene saye, l' astalaedje n' est nén fwait)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, fuzzy, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
 msgstr[1] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tapez so «enter» cwand c' est fwait..."
@@ -2971,12 +2975,12 @@ msgid "Only superuser is allowed to update media"
 msgstr ""
 "Seulmint li super-uzeu a l' droet d' mete a djoû des sopoirts d' astalaedje"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "rén a mete a djoû (eployîz urpmi.addmedia po-z adjouter on sopoirt)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2985,17 +2989,17 @@ msgstr ""
 "i gn a pont d' intrêye a mete a djoû\n"
 "(ene di %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "dj' ignore li sopoirt «%s»"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "dji mete en alaedje li sopoirt «%s»"
@@ -3291,6 +3295,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nou djournå des candjmints di trové\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Metant a djoû les sopoirts...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "corwaitaedje do fitchî %s"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 63bda76a..59791082 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-03-30 14:22+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -23,22 +23,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误: 找不到文件 %s，将取消操作"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -89,22 +89,22 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "安装(_I)"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
@@ -202,12 +202,12 @@ msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包�
 msgid "No packages specified"
 msgstr "未指定软件包"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "请稍候..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "必须是 root"
@@ -238,42 +238,42 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -284,55 +284,62 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 个软件包，%d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...获取失败: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -343,28 +350,27 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -438,58 +444,52 @@ msgstr "环境目录 %s 不存在"
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...获取失败: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
@@ -529,22 +529,22 @@ msgstr "没有要关闭的表达式"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
@@ -636,82 +636,87 @@ msgstr "%s 失败: 退出信号为 %d"
 msgid "%s failed: exited with %d"
 msgstr "%s 失败: 退出代码为 %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "复制失败"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "缺少 curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失败: 下载已取消\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "缺少 aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
@@ -731,58 +736,58 @@ msgstr "未找到软件包 %s。"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[重新打包]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "正在从 %2$s 删除错误的 rpm(%1$s)"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "删除 %s 失败: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
@@ -827,18 +832,23 @@ msgstr "中止"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s 数据库已锁定(其它程序正在使用它)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "仍然继续吗? (y/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -847,57 +857,57 @@ msgstr ""
 "安装失败，rpm 有问题:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "删除已安装的 rpm(%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
@@ -1101,7 +1111,7 @@ msgstr "复制 [%s] 失败(文件太小了)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源综合文件的 md5sum"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "获取[%s]失败(md5sum 不匹配)"
@@ -1141,32 +1151,32 @@ msgstr "介质“%s”未发现元数据"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在获取“%s”的源综合文件..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "介质“%s”未发现综合文件"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "获取[%s]失败"
@@ -1181,94 +1191,99 @@ msgstr "正在重试连接镜像 %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "无法从镜像列表 %s 里找到一个镜像"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "yY是"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr "(是(y)/否(N))[否]"
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "软件包"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "版本"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "释放"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "架构"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(建议安装)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "介质“%s”"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "命令行"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1350,291 +1365,6 @@ msgstr "正在装载 %s"
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf 版本 %s\n"
-"版权 (C) 2002-2006 Mandriva。\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - 打印此工具的版本号。\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - 不打印相同行。\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 只使用升级介质。\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 详细提示。\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - 忽略各种情况下的冲突。\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - 在模式中遵从大小写(默认值)。\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "模式表达式: \n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - 二元 AND 操作符。\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - 二元 OR 操作符。\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - 一元 NOT。\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - 左右括号。\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "标记清单:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - 指定类似 printf 的输出格式\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   例如:“%%name:%%files”\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - 体系\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - 编译主机\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - 编译时间\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - 配置文件\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - conflict 标签\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - 软件包描述\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - 发行版\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - 周期\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --fiename      - 软件包文件名\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - 列出软件包中包含的文件\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - 分组\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - 许可协议\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - 软件包名称\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - obsolets 标签\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - 打包者\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - provides 标签\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - requires 标签\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - 安装大小\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - 源 rpm 名称\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - suggests 标签\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - 摘要\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - 提供者\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - 软件包所在介质\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "格式不对: 您只能使用一个多值标签"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "介质“%s”的 hdlist 不可用"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "介质“%s”的综合文件不可用"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "介质“%s”没有可用的 xml-info"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1651,7 +1381,7 @@ msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
@@ -1661,47 +1391,47 @@ msgstr "下列软件包里有 %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "您应该使用“-a”来全部使用"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "在 urpmi 数据库中找到软件包 %s，但全部都未安装"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "原因是已经安装 %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1710,7 +1440,7 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1719,12 +1449,12 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
@@ -1815,6 +1545,12 @@ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1844,81 +1580,354 @@ msgstr "  --verbose, -v  - 详细提示。\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "删除下列软件包将会破坏您的系统:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "没有可删除的孤立软件包"
 
-#: ../urpme:149
+#: ../urpme:151
 #, 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] "为满足相关性要求，需要删除下列%d个软件包"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(孤立的软件包)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr "(是(y)/否(N))[否]"
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "测试删除 %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "删除失败"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "可以删除"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf 版本 %s\n"
+"版权 (C) 2002-2006 Mandriva。\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - 打印此工具的版本号。\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - 不打印相同行。\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 只使用升级介质。\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 详细提示。\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - 忽略各种情况下的冲突。\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - 在模式中遵从大小写(默认值)。\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "模式表达式: \n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - 二元 AND 操作符。\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - 二元 OR 操作符。\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - 一元 NOT。\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - 左右括号。\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "标记清单:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - 指定类似 printf 的输出格式\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   例如:“%%name:%%files”\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - 体系\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - 编译主机\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - 编译时间\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - 配置文件\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - conflict 标签\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - 软件包描述\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - 发行版\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - 周期\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --fiename      - 软件包文件名\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - 列出软件包中包含的文件\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - 分组\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - 许可协议\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - 软件包名称\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - obsolets 标签\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - 打包者\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - provides 标签\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - requires 标签\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - 安装大小\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - 源 rpm 名称\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - suggests 标签\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - 摘要\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - 提供者\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - 软件包所在介质\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "未终止的表达式(%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "格式不对: 您只能使用一个多值标签"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "介质“%s”的 hdlist 不可用"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "介质“%s”的综合文件不可用"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "介质“%s”没有可用的 xml-info"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2250,48 +2259,43 @@ msgstr ""
 "错误: %s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "正在更新介质...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2301,7 +2305,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2311,7 +2315,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2320,12 +2324,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2334,7 +2338,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2343,12 +2347,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2358,7 +2362,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2368,12 +2372,12 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2383,44 +2387,44 @@ msgstr ""
 "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包将被删除。"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
@@ -2863,12 +2867,12 @@ msgstr "  -ff            - 强迫更新综合文件。\n"
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2877,17 +2881,17 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "启用介质 %s"
@@ -3150,6 +3154,9 @@ msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何�
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "正在更新介质...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "正在检查 %s 文件"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d91c3b0a..448be19b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-11-01 10:40+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -32,22 +32,22 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 套件安裝"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "錯誤：無法找到檔案 %s，作業將取消"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "確定 (_O)"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -68,7 +68,7 @@ msgstr ""
 "\n"
 "您想怎麼做？"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -83,7 +83,7 @@ msgstr ""
 "\n"
 "要繼續嗎？"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -98,22 +98,22 @@ msgstr ""
 "\n"
 "您或許傾向儲存而非安裝它。您的選擇是什麼？"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "安裝 (_I)"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "取消 (_C)"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "選擇存檔的位置"
@@ -211,12 +211,12 @@ msgstr "  --searchmedia  - 只使用指定的媒體來搜尋需要的套件。\n
 msgid "No packages specified"
 msgstr "未指定套件"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "請稍候..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "必須擁有管理者權限"
@@ -247,42 +247,42 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (升級用)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (安裝用)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "套件選擇"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "放棄 (_A)"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -293,55 +293,62 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "為了滿足相依性，將會一併安裝下列套件："
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 個套件，共 %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...擷取失敗：%s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -352,28 +359,27 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完畢"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -447,58 +453,52 @@ msgstr "環境目錄 %s 不存在"
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在擷取 rpm 檔案 [%s] ..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...擷取失敗：%s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "無法解析 spec 檔案 %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "無法註冊 rpm 檔案"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "與 RPM 檔案 [%s] 不相容的硬體架構"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "註冊本地端套件錯誤"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "使用限制模式執行時禁止該操作程序"
@@ -538,22 +538,22 @@ msgstr "樣版表示式：\n"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目錄不存在"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
@@ -645,82 +645,87 @@ msgstr "%s 失敗：離開訊號 %d"
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "複製失敗"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget 遺失了\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl 遺失了\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失敗：已取消下載\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync 遺失了\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh 遺失了\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla 遺失了\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "無法執行 prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 遺失了\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已經完成 %s%% 共 %s，ETA = %s，速度 = %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 完成，速度 = %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "正在取得 %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr ".已取得 %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定義了未知的通訊協定"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "沒有找到 webfetch，支援的 webfetch 有：%s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "無法處理通訊協定：%s"
@@ -740,58 +745,58 @@ msgstr "沒有找到套件 %s。"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[正在重新打包]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已建立在 %s 上的安裝程序 (移除 = %d，安裝 = %d，升級 = %d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "無法建立安裝程序"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "無法由 delta-rpm 套件包中取出套件 %s"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "無法安裝套件 %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "正在由 %2$s 移除不良的 RPM (%1$s)"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "移除 %s 失敗：%s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在由 %2$s 移除已安裝的 RPM (%1$s)"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "更多關於套件 %s 的資訊"
@@ -836,18 +841,23 @@ msgstr "放棄"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s 資料庫已被鎖定 (另一個程式已經在使用它了)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
 #, c-format
-msgid "Try to go on anyway? (y/N) "
+msgid "Try to go on anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -856,57 +866,57 @@ msgstr ""
 "安裝失敗，損毀的套件：\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "下列套件有不正確的簽章"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列套件有不正確的簽章"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您要繼續安裝嗎？"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "正在移除已安裝的套件 (%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "正在發佈 %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在由 %2$s 安裝 %1$s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "套件都已經更新了"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安裝"
@@ -1110,7 +1120,7 @@ msgstr "複製 [%s] 失敗 (檔案小得可疑)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在計算來源 synthesis 的 md5sum"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] 擷取失敗 (md5sum 不合)"
@@ -1150,32 +1160,32 @@ msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在擷取 \"%s\" 的來源 synthesis..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "檢驗 \"%s\" 的公鑰..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "無法匯入 \"%s\" 的公鑰"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新媒體 \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1190,94 +1200,99 @@ msgstr ""
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "無法從鏡像站列表 %s 找到鏡像站"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "正由 %s 取得鏡像站列表"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "Nn否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy是"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) (是/否) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "抱歉，選擇錯誤，請再試一次\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "套件"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "版本"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "釋出"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "硬體架構"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(建議)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "媒體 \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "命令列"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1359,291 +1374,6 @@ msgstr "正在掛載 %s"
 msgid "unmounting %s"
 msgstr "正在卸載 %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, 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"
-msgstr ""
-"urpmf 版本號 %s\n"
-"Copyright (C) 2002-2006 Mandriva。\n"
-"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
-"\n"
-"用法：urpmf [選項] pattern-expression\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - 印出這個工具的版本編號。\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - 不使用給定的媒體，不同媒體間請以逗號分隔。\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - 不比對樣版，把參數當作一般字串。\n"
-
-#: ../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 "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - 使用另一個根目錄存放 urpmi 資料庫與 RPM 的安裝。\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - 依據子字串排序媒體，以逗號分開。\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - 使用指定的路徑來存取媒體\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - 不顯示相同的訊息。\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 只使用更新媒體。\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 完整訊息模式。\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - 忽略樣版中的大小寫差異。\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - 分辨樣版中的大小寫差異 (預設值)。\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<字串>       - 更改字串分隔符號 (預設為“:”)。\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "樣版表示式：\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "  文字           - 任何文字都將被分析為正規表示式，除非使用了 -l。\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - 直接包含 perl 原始碼，類似 perl -e。\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - 二元 AND 運算子。\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - 二元 OR 運算子。\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - 一元 NOT 運算子。\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - 左右括弧。\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "標籤清單：\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - 使用類似 printf 的輸出格式\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   範例：'%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - 硬體架構\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - 建立主機\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - 建立時間\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - 組態檔\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - 衝突標籤\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - 套件描述\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - 發行版\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - 時期\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - 套件檔案名稱\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - 列出套件內包含的檔案\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - 群組\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - 授權\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - 套件名稱\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - 淘汰標籤\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - 打包者\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - 提供標籤\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - 需要標籤\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - 安裝大小\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - 原始碼套件名稱\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - 建議標籤\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - 摘要\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - 提供者\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - 這個套件被找到的媒介\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - 顯示版本、發行編號與平台。\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "格式錯誤：您只能使用一個多值標籤"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "媒體 \"%s\" 沒有可用的 hdlist"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "媒體 \"%s\" 沒有可用的 synthesis"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "媒體 \"%s\" 沒有可用的 xml-info"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1660,7 +1390,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "沒有套件命名為 %s"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下套件包含 %s：%s"
@@ -1670,47 +1400,47 @@ msgstr "以下套件包含 %s：%s"
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "%s 套件無法安裝"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "%s 套件已經安裝了"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "%s 套件已經安裝了"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "由於遺失了 %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "由於已經安裝了 %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於未滿足 %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在試著促進 %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了要保留 %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1719,7 +1449,7 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1728,12 +1458,12 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "為了要安裝 %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "由於與 %s 發生衝突"
@@ -1824,6 +1554,12 @@ msgstr "  --repackage    - 在移除前重新打包檔案\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - 使用另一個根目錄存放 urpmi 資料庫與 RPM 的安裝。\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1853,81 +1589,354 @@ msgstr "  --verbose, -v  - 詳細訊息模式。\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 選擇所有符合描述的套件。\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只有擁有管理者權限的使用者才能移除套件"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "未知的套件"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "未知的套件"
 
-#: ../urpme:121
+#: ../urpme:123
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "移除套件 %s 將破壞您的系統"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "沒有東西可移除"
 
-#: ../urpme:143
+#: ../urpme:145
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "沒有東西可移除"
 
-#: ../urpme:149
+#: ../urpme:151
 #, 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] "為了滿足相依性，下列 %d 個套件將被移除"
 
-#: ../urpme:154
+#: ../urpme:156
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "未知的套件"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "要移除這 %d 個套件嗎？"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) (是/否) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "將可移除式裝置當成 \"%s\""
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "移除失敗"
 
-#: ../urpme:183
+#: ../urpme:187
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "移除失敗"
 
+#: ../urpmf:29
+#, 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"
+msgstr ""
+"urpmf 版本號 %s\n"
+"Copyright (C) 2002-2006 Mandriva。\n"
+"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
+"\n"
+"用法：urpmf [選項] pattern-expression\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - 印出這個工具的版本編號。\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - 不使用給定的媒體，不同媒體間請以逗號分隔。\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr "  --literal, -l  - 不比對樣版，把參數當作一般字串。\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - 依據子字串排序媒體，以逗號分開。\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - 使用指定的路徑來存取媒體\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - 不顯示相同的訊息。\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 只使用更新媒體。\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 完整訊息模式。\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - 忽略樣版中的大小寫差異。\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - 分辨樣版中的大小寫差異 (預設值)。\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<字串>       - 更改字串分隔符號 (預設為“:”)。\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "樣版表示式：\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr "  文字           - 任何文字都將被分析為正規表示式，除非使用了 -l。\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - 直接包含 perl 原始碼，類似 perl -e。\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - 二元 AND 運算子。\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - 二元 OR 運算子。\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - 一元 NOT 運算子。\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - 左右括弧。\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "標籤清單：\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - 使用類似 printf 的輸出格式\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   範例：'%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - 硬體架構\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - 建立主機\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - 建立時間\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - 組態檔\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - 衝突標籤\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - 套件描述\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - 發行版\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - 時期\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - 套件檔案名稱\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - 列出套件內包含的檔案\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - 群組\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - 授權\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - 套件名稱\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - 淘汰標籤\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - 打包者\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - 提供標籤\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - 需要標籤\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - 安裝大小\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - 原始碼套件名稱\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - 建議標籤\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - 摘要\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - URL\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - 提供者\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - 這個套件被找到的媒介\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - 顯示版本、發行編號與平台。\n"
+
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "樣版表示式：\n"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "格式錯誤：您只能使用一個多值標籤"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "媒體 \"%s\" 沒有可用的 hdlist"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "媒體 \"%s\" 沒有可用的 synthesis"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "媒體 \"%s\" 沒有可用的 xml-info"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2263,48 +2272,43 @@ msgstr ""
 "錯誤：%s 似乎被掛載為唯讀模式。\n"
 "使用 --allow-force 標籤來強制執行。"
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "正在更新媒體...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s：%s (升級用)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (升級用)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s：%s (安裝用)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (安裝用)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "為了滿足 '%s' 的相依性，需要下列套件之一："
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "您要選擇何者？ (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2314,7 +2318,7 @@ msgstr ""
 "下列套件無法安裝，因為它需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2324,7 +2328,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2333,12 +2337,12 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2347,7 +2351,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2356,12 +2360,12 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2371,7 +2375,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2381,12 +2385,12 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(僅測試，移除動作並不會真的執行)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2396,44 +2400,44 @@ msgstr ""
 "您必須先呼叫 urpmi --buildrequires 來安裝下列相依性套件：\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(僅測試，安裝動作並不會真的執行)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "將使用 %s 額外磁碟空間。"
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "將釋放 %s 磁碟空間。"
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "將取得 %s 軟體套件。"
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "繼續安裝這 %d 個套件？"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "掛載好後請按 Enter..."
@@ -2518,7 +2522,8 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 "  --xml-info     - 使用指定的策略下載 xml 資訊檔\n"
-"                   包含：never、on-demand、update-only、always。參閱 urpmi.cfg(5)\n"
+"                   包含：never、on-demand、update-only、always。參閱 urpmi."
+"cfg(5)\n"
 
 #: ../urpmi.addmedia:69
 #, c-format
@@ -2877,12 +2882,12 @@ msgstr "  -ff            - 確實的強制更新 synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "只有管理者才能跟新媒體"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可供更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2891,17 +2896,17 @@ msgstr ""
 "要更新的項目遺失\n"
 "(%s 的其中之一)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "略過媒體 %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "啟用媒體 %s"
@@ -3166,6 +3171,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "正在更新媒體...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "正在檢驗 %s 檔案"
author	Jure Repinc <jure@mandriva.org>	2009-03-03 15:58:09 +0000
committer	Jure Repinc <jure@mandriva.org>	2009-03-03 15:58:09 +0000
commit	53f630a042ffb907107d392c9f765d72af61d789 (patch)
tree	866f32e62afc20482eb1db7a18ba41f0f4820b75
parent	838598f7bdd3678add242c86602198b15417a3f9 (diff)
download	urpmi-53f630a042ffb907107d392c9f765d72af61d789.tar urpmi-53f630a042ffb907107d392c9f765d72af61d789.tar.gz urpmi-53f630a042ffb907107d392c9f765d72af61d789.tar.bz2 urpmi-53f630a042ffb907107d392c9f765d72af61d789.tar.xz urpmi-53f630a042ffb907107d392c9f765d72af61d789.zip