sync with code

1 files changed, 565 insertions, 496 deletions

diff --git a/po/et.po b/po/et.po
index 5f4b2d99..282c9253 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-02-14 13:05+0100\n"
+"POT-Creation-Date: 2008-02-25 11:14+0100\n"
 "PO-Revision-Date: 2008-02-22 23:31+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -139,7 +139,7 @@ msgstr ""
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gurpmi2:114 ../urpmi:625
+#: ../gurpmi2:114 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
@@ -180,13 +180,13 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:215 ../urpmi:591
+#: ../gurpmi2:215 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
 
-#: ../gurpmi2:216 ../urpmi:592
+#: ../gurpmi2:216 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -219,7 +219,7 @@ msgstr "Valmistumine..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../gurpmi2:260 ../urpmi:619
+#: ../gurpmi2:260 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
@@ -301,7 +301,7 @@ msgstr "                    vaikimisi on %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - näitab RPM-i täielikku nime (NVRA).\n"
 
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Pakette võib paigaldada ainult administraator"
@@ -311,68 +311,68 @@ msgstr "Pakette võib paigaldada ainult administraator"
 msgid "Running urpmi in restricted mode..."
 msgstr "Urpmi käivitamine piiratud režiimis..."
 
-#: ../urpm.pm:108
+#: ../urpm.pm:110
 #, c-format
 msgid "fail to create directory %s"
 msgstr "kataloogi %s loomine ebaõnnestus"
 
-#: ../urpm.pm:109
+#: ../urpm.pm:111
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "kataloogi %s vale omanik"
 
-#: ../urpm.pm:208
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb avamine ebaõnnestus"
 
-#: ../urpm.pm:222
+#: ../urpm.pm:224
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "vigane RPM-faili nimi [%s]"
 
-#: ../urpm.pm:228
+#: ../urpm.pm:230
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-faili [%s] tõmbamine..."
 
-#: ../urpm.pm:230 ../urpm/get_pkgs.pm:158
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
 #, c-format
 msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
 
-#: ../urpm.pm:233 ../urpm/download.pm:686 ../urpm/get_pkgs.pm:160
-#: ../urpm/media.pm:742 ../urpm/media.pm:1144 ../urpm/media.pm:1320
+#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
+#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...tõmbamine ebaõnnestus: %s"
 
-#: ../urpm.pm:238
+#: ../urpm.pm:240
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ligipääs RPM-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm:243
+#: ../urpm.pm:245
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "spetsifikatsioonifaili %s parsimine ebaõnnestus [%s]"
 
-#: ../urpm.pm:251
+#: ../urpm.pm:253
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-faili registreerimine ebaõnnestus"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:255
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Sobimatu arhitektuur RPM-ile [%s]"
 
-#: ../urpm.pm:257
+#: ../urpm.pm:259
 #, c-format
 msgid "error registering local packages"
 msgstr "viga kohalike pakettide registreerimisel"
 
-#: ../urpm.pm:355
+#: ../urpm.pm:357
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "See operatsioon on piiratud režiimis keelatud"
@@ -387,32 +387,33 @@ msgstr "käsureal on määratud vigane puhverserver\n"
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faili \"%s\" lugemine ebaõnnestus\n"
 
-#: ../urpm/args.pm:352
+#: ../urpm/args.pm:353
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "vaikimisi ootab urpmf regulaaravaldist, peaksite kasutama võtit \"--literal\""
+msgstr ""
+"vaikimisi ootab urpmf regulaaravaldist, peaksite kasutama võtit \"--literal\""
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:419
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kataloogi ei ole olemas"
 
-#: ../urpm/args.pm:437
+#: ../urpm/args.pm:438
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#: ../urpm/args.pm:440 ../urpm/args.pm:443
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s kasutamine ei ole võimalik %s-ga"
 
-#: ../urpm/args.pm:451
+#: ../urpm/args.pm:452
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
 
-#: ../urpm/bug_report.pm:48 ../urpmi:246
+#: ../urpm/bug_report.pm:48 ../urpmi:247
 #, c-format
 msgid "Copying failed"
 msgstr "Kopeerimine ebaõnnestus"
@@ -432,7 +433,7 @@ msgstr "seadistustefaili [%s] lugemine ebaõnnestus"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "andmekandja '%s' on määratud kaks korda, loobutakse'"
 
-#: ../urpm/cfg.pm:248 ../urpm/media.pm:443 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "seadistustefaili [%s] kirjutamine ebaõnnestus"
@@ -467,87 +468,87 @@ msgstr "%s ebaõnnestus: lõpetas signaaliga %d"
 msgid "%s failed: exited with %d"
 msgstr "%s ebaõnnestus: lõpetas %d-ga"
 
-#: ../urpm/download.pm:229
+#: ../urpm/download.pm:234
 #, c-format
 msgid "copy failed"
 msgstr "kopeerimine ebaõnnestus"
 
-#: ../urpm/download.pm:235
+#: ../urpm/download.pm:240
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget puudub\n"
 
-#: ../urpm/download.pm:300
+#: ../urpm/download.pm:305
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl puudub\n"
 
-#: ../urpm/download.pm:425
+#: ../urpm/download.pm:430
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl ebaõnnestus: allalaadimine katkestati\n"
 
-#: ../urpm/download.pm:464
+#: ../urpm/download.pm:469
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync puudub\n"
 
-#: ../urpm/download.pm:530
+#: ../urpm/download.pm:535
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh puudub\n"
 
-#: ../urpm/download.pm:549
+#: ../urpm/download.pm:554
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla puudub\n"
 
-#: ../urpm/download.pm:565
+#: ../urpm/download.pm:570
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Prozilla käivitamine nurjus\n"
 
-#: ../urpm/download.pm:573
+#: ../urpm/download.pm:578
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 puudub\n"
 
-#: ../urpm/download.pm:676
+#: ../urpm/download.pm:681
 #, 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:678
+#: ../urpm/download.pm:683
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% valmis, kiirus: %s"
 
-#: ../urpm/download.pm:735
+#: ../urpm/download.pm:740
 #, c-format
 msgid "retrieving %s"
 msgstr "%s tõmbamine"
 
-#: ../urpm/download.pm:739
+#: ../urpm/download.pm:744
 #, c-format
 msgid "retrieved %s"
 msgstr "tõmmati %s"
 
-#: ../urpm/download.pm:752
+#: ../urpm/download.pm:772
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "tundmatu protokoll %s jaoks"
 
-#: ../urpm/download.pm:772
+#: ../urpm/download.pm:792
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s ei ole kättesaadav, kasutatakse %s"
 
-#: ../urpm/download.pm:776
+#: ../urpm/download.pm:796
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
 
-#: ../urpm/download.pm:797
+#: ../urpm/download.pm:817
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ei suuda käsitleda protokolli: %s"
@@ -562,19 +563,19 @@ msgstr "puhastatakse %s ja %s"
 msgid "package %s is not found."
 msgstr "paketti %s ei leitud."
 
-#: ../urpm/get_pkgs.pm:134
+#: ../urpm/get_pkgs.pm:136
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "vigane URL: [%s]"
 
-#: ../urpm/get_pkgs.pm:147
+#: ../urpm/get_pkgs.pm:149
 #, c-format
 msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 msgstr ""
 "vabandust, võtit --install-src ei saa kasutada võrgus paiknevate .src.rpm-"
 "failide paigaldamiseks"
 
-#: ../urpm/get_pkgs.pm:154
+#: ../urpm/get_pkgs.pm:156
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM-failide tõmbamine andmekandjalt \"%s\"..."
@@ -596,32 +597,42 @@ msgstr ""
 msgid "unable to create transaction"
 msgstr "tehingu loomine ebaõnnestus"
 
-#: ../urpm/install.pm:179
+#: ../urpm/install.pm:180
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "RPM-i ekstraktimine delta-rpm-paketist %s ebaõnnestus"
 
-#: ../urpm/install.pm:190
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to install package %s"
 msgstr "paketi %s paigaldamine ebaõnnestus"
 
-#: ../urpm/install.pm:227
+#: ../urpm/install.pm:196
+#, fuzzy, c-format
+msgid "removing bad rpm (%s) from %s"
+msgstr "paigaldatud RPM-failide (%s) eemaldamine %s-st"
+
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
+#, fuzzy, c-format
+msgid "removing %s failed: %s"
+msgstr "...tõmbamine ebaõnnestus: %s"
+
+#: ../urpm/install.pm:235
 #, c-format
 msgid "Removing package %s"
 msgstr "Paketi %s eemaldamine"
 
-#: ../urpm/install.pm:228
+#: ../urpm/install.pm:236
 #, c-format
 msgid "removing package %s"
 msgstr "paketi %s eemaldamine"
 
-#: ../urpm/install.pm:243
+#: ../urpm/install.pm:252
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "paigaldatud RPM-failide (%s) eemaldamine %s-st"
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:260
 #, c-format
 msgid "More information on package %s"
 msgstr "Rohkem infot paketi %s kohta"
@@ -717,38 +728,45 @@ msgid "Try harder to install (--force)? (y/N) "
 msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
 
 #: ../urpm/main_loop.pm:264
+#, fuzzy, c-format
+msgid ""
+"Installation failed, bad rpms:\n"
+"%s"
+msgstr "Paigaldamine ebaõnnestus:"
+
+#: ../urpm/main_loop.pm:270
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
 msgstr[0] "%d paigaldamistehing ebaõnnestus"
 msgstr[1] "%d paigaldamistehingut ebaõnnestus"
 
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:281
 #, c-format
 msgid "Installation is possible"
 msgstr "Paigaldamine on võimalik"
 
-#: ../urpm/main_loop.pm:280
+#: ../urpm/main_loop.pm:286
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pole ühtegi paketti uuendada"
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:294
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakett %s on juba paigaldatud"
 
-#: ../urpm/main_loop.pm:289
+#: ../urpm/main_loop.pm:295
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketid %s on juba paigaldatud"
 
-#: ../urpm/main_loop.pm:292
+#: ../urpm/main_loop.pm:298
 #, c-format
 msgid "Package %s can not be installed"
 msgstr "Paketti %s ei saa paigaldada"
 
-#: ../urpm/main_loop.pm:293
+#: ../urpm/main_loop.pm:299
 #, c-format
 msgid "Packages %s can not be installed"
 msgstr "Pakette %s ei saa paigaldada"
@@ -763,69 +781,69 @@ msgstr "%s faili uurimine"
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "hoiatus: MD5SUM failis puudub %s MD5 kontrollsumma"
 
-#: ../urpm/media.pm:185
+#: ../urpm/media.pm:187
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuaalsel andmekandjal \"%s\" peaks olema selge URL, seda eiratakse"
 
-#: ../urpm/media.pm:187
+#: ../urpm/media.pm:189
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ligipääs \"%s\" nimekirjafailile ebaõnnestus, andmekandjat eiratakse"
 
-#: ../urpm/media.pm:194
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "ligipääs \"%s\" sünteesifailile nurjus, andmekandjat eiratakse"
 
-#: ../urpm/media.pm:221
+#: ../urpm/media.pm:223
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "püütakse vältida olemasolevat andmekandjat \"%s\""
 
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:409
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "eemaldataval andmekandjal \"%s\" on liiga palju haakepunkte"
 
-#: ../urpm/media.pm:403
+#: ../urpm/media.pm:410
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "eemaldatavat andmekandjat käsitletakse kui \"%s\""
 
-#: ../urpm/media.pm:406
+#: ../urpm/media.pm:413
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr ""
 "Andmekandja \"%s\" on ISO-tõmmis, mis haagitakse vastavalt vajadusele "
 "automaatselt"
 
-#: ../urpm/media.pm:409
+#: ../urpm/media.pm:416
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "kasutatakse teist eemaldatavat seadet [%s] \"%s\" jaoks"
 
-#: ../urpm/media.pm:414 ../urpm/media.pm:417
+#: ../urpm/media.pm:421 ../urpm/media.pm:424
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "eemaldatava andmekandja \"%s\" asukoha hankimine ebaõnnestus"
 
-#: ../urpm/media.pm:445 ../urpm/media.pm:451
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "seadistustefaili [%s] kirjutamine"
 
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:501
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Paralleelrežiimi ei saa kasutada koos võtmega use-distrib"
 
-#: ../urpm/media.pm:502
+#: ../urpm/media.pm:509
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "seostatava andmekandja kasutamine paralleelrežiimis: %s"
 
-#: ../urpm/media.pm:518
+#: ../urpm/media.pm:525
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -834,163 +852,163 @@ msgstr ""
 "võtit --synthesis ei saa kasutada võtmega --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib või --parallel"
 
-#: ../urpm/media.pm:602
+#: ../urpm/media.pm:612
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Otsingu algus: %s lõpp: %s"
 
-#: ../urpm/media.pm:617
+#: ../urpm/media.pm:627
 #, c-format
 msgid "skipping package %s"
 msgstr "pakett %s jäetakse vahele"
 
-#: ../urpm/media.pm:633
+#: ../urpm/media.pm:643
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paketti %s ei uuendata, seda saab ainult paigaldada"
 
-#: ../urpm/media.pm:658
+#: ../urpm/media.pm:668
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "andmekandja \"%s\" on juba olemas"
 
-#: ../urpm/media.pm:686
+#: ../urpm/media.pm:710
 #, c-format
 msgid "(ignored by default)"
 msgstr "(vaikimisi eiratakse)"
 
-#: ../urpm/media.pm:692
+#: ../urpm/media.pm:716
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine enne võrguandmekandjat \"%s\""
 
-#: ../urpm/media.pm:698
+#: ../urpm/media.pm:722
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine"
 
-#: ../urpm/media.pm:725
+#: ../urpm/media.pm:750
 #, c-format
 msgid "unable to mount the distribution medium"
 msgstr "distributsiooniandmekandja ühendamine nurjus"
 
-#: ../urpm/media.pm:728
+#: ../urpm/media.pm:753
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "see asukoht ei paista sisaldavat ühtegi distributsiooni"
 
-#: ../urpm/media.pm:735
-#, c-format
-msgid "retrieving media.cfg file..."
-msgstr "faili media.cfg tõmbamine..."
-
-#: ../urpm/media.pm:740
+#: ../urpm/media.pm:769
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "faili media.cfg parsimine ebaõnnestus"
 
-#: ../urpm/media.pm:743
+#: ../urpm/media.pm:772
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "ligipääs distributsiooniandmekandjale ebaõnnestus (ei leitud faili media.cfg)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:790
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "jäetakse vahele mitteühilduv andmekandja '%s' (%s)"
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:839
+#, c-format
+msgid "retrieving media.cfg file..."
+msgstr "faili media.cfg tõmbamine..."
+
+#: ../urpm/media.pm:880
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "püüti valida olematut andmekandjat \"%s\""
 
-#: ../urpm/media.pm:840
+#: ../urpm/media.pm:883
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "mitme andmekandja valik: %s"
 
-#: ../urpm/media.pm:860
+#: ../urpm/media.pm:903
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "andmekandja \"%s\" eemaldamine"
 
-#: ../urpm/media.pm:926
+#: ../urpm/media.pm:979
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "urpmi ümberseadistamine andmekandja \"%s\" tarbeks"
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:1017
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ümberseadistamine ebaõnnestus"
 
-#: ../urpm/media.pm:970
+#: ../urpm/media.pm:1023
 #, c-format
 msgid "reconfiguration done"
 msgstr "ümberseadistamine tehtud"
 
-#: ../urpm/media.pm:991
+#: ../urpm/media.pm:1044
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "andmekandja \"%s\" on täiesti värske"
 
-#: ../urpm/media.pm:1002
+#: ../urpm/media.pm:1055
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sünteesifaili [%s] uurimine"
 
-#: ../urpm/media.pm:1022
+#: ../urpm/media.pm:1075
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
 
-#: ../urpm/media.pm:1035 ../urpm/media.pm:1117
+#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopeeritakse [%s] andmekandjale \"%s\"..."
 
-#: ../urpm/media.pm:1037 ../urpm/media.pm:1092 ../urpm/media.pm:1336
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
 #, c-format
 msgid "...copying failed"
 msgstr "...kopeerimine ebaõnnestus"
 
-#: ../urpm/media.pm:1088
+#: ../urpm/media.pm:1141
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" kirjelduste faili kopeerimine..."
 
-#: ../urpm/media.pm:1090 ../urpm/media.pm:1121
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
 #, c-format
 msgid "...copying done"
 msgstr "...kopeerimine tehtud"
 
-#: ../urpm/media.pm:1123
+#: ../urpm/media.pm:1177
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopeerimine ebaõnnestus (fail on kahtlaselt väike)"
 
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1210
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "tõmmatud allika sünteesifaili MD5SUM arvutamine"
 
-#: ../urpm/media.pm:1157 ../urpm/media.pm:1572
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] tõmbamine ebaõnnestus (MD5SUM ei klapi)"
 
-#: ../urpm/media.pm:1172
+#: ../urpm/media.pm:1227
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 ebaõnnestus %s puhul"
 
-#: ../urpm/media.pm:1182
+#: ../urpm/media.pm:1237
 #, c-format
 msgid "comparing %s and %s"
 msgstr "%s ja %s võrdlemine"
 
-#: ../urpm/media.pm:1202
+#: ../urpm/media.pm:1257
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1000,64 +1018,84 @@ msgstr ""
 "andmekandjat \"%s\" ei õnnestunud leida,\n"
 "mis võib juhtuda siis, kui andmekandjat luues ühendati kataloog käsitsi."
 
-#: ../urpm/media.pm:1215
+#: ../urpm/media.pm:1270
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "vigane hdlist-fail %s andmekandjale \"%s\""
 
-#: ../urpm/media.pm:1241
+#: ../urpm/media.pm:1296
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" MD5SUM-faili kopeerimine..."
 
-#: ../urpm/media.pm:1295
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" allika sünteesifaili tõmbamine..."
 
-#: ../urpm/media.pm:1312
+#: ../urpm/media.pm:1367
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "leiti kontrollitud sünteesifail %s"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1425
+#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1425
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" avaliku võtme faili uurimine..."
 
-#: ../urpm/media.pm:1382
+#: ../urpm/media.pm:1437
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
 
-#: ../urpm/media.pm:1386
+#: ../urpm/media.pm:1441
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" avaliku võtme faili import ebaõnnestus"
 
-#: ../urpm/media.pm:1455
+#: ../urpm/media.pm:1512
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uuendati andmekandjat \"%s\""
 
-#: ../urpm/media.pm:1566
+#: ../urpm/media.pm:1623
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%] tõmbamine ebaõnnestus"
 
-#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:521 ../urpmi:610
+#: ../urpm/mirrors.pm:19
+#, c-format
+msgid "trying again with mirror %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:60
+#, c-format
+msgid "Could not find a mirror from mirrorlist %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:133
+#, c-format
+msgid "found geolocalisation %s %.2f %.2f from timezone %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:178
+#, fuzzy, c-format
+msgid "getting mirror list from %s"
+msgstr "[%s] RPM-failide lugemine"
+
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
 #, c-format
 msgid "Nn"
 msgstr "EeNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:522 ../urpmi:561
-#: ../urpmi:611 ../urpmi:641 ../urpmi:647 ../urpmi.addmedia:122
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:507 ../urpmi:523 ../urpmi:562
+#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
@@ -1177,239 +1215,7 @@ msgstr "andmekandja \"%s\" on kirjas eemaldatavana, aga ei ole seda mitte"
 msgid "unable to access medium \"%s\""
 msgstr "ligipääs andmekandjale \"%s\" ebaõnnestus"
 
-#: ../urpm/select.pm:21
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-"urpmi käivitati uuesti ja prioriteetsete pakettide nimekirja ei muudetud"
-
-#: ../urpm/select.pm:23
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"urpmi käivitati uuesti ja muudeti prioriteetsete pakettide nimekirja: %s %s "
-"asemel5"
-
-#: ../urpm/select.pm:184
-#, c-format
-msgid "No package named %s"
-msgstr "Paketti nimega %s ei ole"
-
-#: ../urpm/select.pm:186 ../urpme:107
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s sisaldub järgmistes pakettides: %s"
-
-#: ../urpm/select.pm:495 ../urpm/select.pm:538
-#, c-format
-msgid "due to missing %s"
-msgstr "puuduva %s tõttu"
-
-#: ../urpm/select.pm:496
-#, c-format
-msgid "due to already installed %s"
-msgstr "juba paigaldatud %s tõttu"
-
-#: ../urpm/select.pm:497 ../urpm/select.pm:536
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "rahuldamata %s tõttu"
-
-#: ../urpm/select.pm:503
-#, c-format
-msgid "trying to promote %s"
-msgstr "püüdes välja pakkuda %s"
-
-#: ../urpm/select.pm:504
-#, c-format
-msgid "in order to keep %s"
-msgstr "säilitamaks %s"
-
-#: ../urpm/select.pm:532
-#, c-format
-msgid "in order to install %s"
-msgstr "paigaldamaks %s"
-
-#: ../urpm/select.pm:542
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "konflikti tõttu %s-ga"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Vigane signatuur (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Vigane võtme ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Puudub signatuur (%s)"
-
-#: ../urpm/sys.pm:221
-#, c-format
-msgid "Can't write file"
-msgstr "Faili kirjutamine nurjus"
-
-#: ../urpm/sys.pm:221
-#, c-format
-msgid "Can't open file"
-msgstr "Faili avamine nurjus"
-
-#: ../urpme:40
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versioon %s\n"
-"Autoriõigus © 1999-2006 Mandriva.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine:\n"
-
-#: ../urpme:45 ../urpmf:35 ../urpmi:74 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
-#, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - näitab seda abiteadet.\n"
-
-#: ../urpme:46
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
-
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
-"olemas.\n"
-
-#: ../urpme:49 ../urpmi:109 ../urpmq:67
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
-"masina.\n"
-
-#: ../urpme:50 ../urpmi:140
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
-
-#: ../urpme:51
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
-
-#: ../urpme:52 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:60
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:69
-#, 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:53
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
-
-#: ../urpme:54
-#, 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  - seadistab urpme lennult distributsioonipuu põhjal,\n"
-"                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
-"root.\n"
-
-#: ../urpme:56 ../urpmi:151 ../urpmq:84
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - selgitav režiim.\n"
-
-#: ../urpme:57
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
-
-#: ../urpme:70
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Tarkvara võib eemaldada ainult administraator"
-
-#: ../urpme:100
-#, c-format
-msgid "unknown packages"
-msgstr "tundmatud paketid"
-
-#: ../urpme:100
-#, c-format
-msgid "unknown package"
-msgstr "tundmatu pakett"
-
-#: ../urpme:113 ../urpmi:535
-#, c-format
-msgid "removing package %s will break your system"
-msgstr "paketi %s eemaldamine halvab Teie süsteemi"
-
-#: ../urpme:115
-#, c-format
-msgid "Nothing to remove"
-msgstr "Pole midagi eemaldada"
-
-#: ../urpme:120
-#, c-format
-msgid "Checking to remove the following packages"
-msgstr "Kontrollitakse, kas on võimalik eemaldada järgmised paketid"
-
-#: ../urpme:124
-#, 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] "Sõltuvuste lahendamiseks tuleb eemaldada järgmine pakett"
-msgstr[1] "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti"
-
-#: ../urpme:128
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Kas eemaldada %d pakett?"
-msgstr[1] "Kas eemaldada %d paketti?"
-
-#: ../urpme:128 ../urpmi:562 ../urpmi:642 ../urpmi.addmedia:125
-#, c-format
-msgid " (y/N) "
-msgstr " (j/E) "
-
-#: ../urpme:150
-#, c-format
-msgid "Removal failed"
-msgstr "Eemaldamine ebaõnnestus"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1426,26 +1232,33 @@ msgstr ""
 "\n"
 "kasutamine: urpmf [võtmed] pattern-expression\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - näitab seda abiteadet.\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"
 
-#: ../urpmf:37 ../urpmi:131 ../urpmq:79
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
 "                   vearaportideks).\n"
 
-#: ../urpmf:38 ../urpmi:76 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../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
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1453,14 +1266,23 @@ msgstr ""
 "  --literal, -l  - mustrina tõlgendamise asemel kasutatakse argumenti "
 "täpselt esitatud kujul.\n"
 
-#: ../urpmf:41 ../urpmi:75 ../urpmq:47
+#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
+#: ../urpmi.update:46 ../urpmq:69
+#, c-format
+msgid "  --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:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - kasutatakse ainult määratud andmekandjaid (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:42 ../urpmi:79 ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1468,251 +1290,474 @@ msgstr ""
 "  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:43
+#: ../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"
 
-#: ../urpmf:44 ../urpmi:80 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../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
+#: ../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"
 
-#: ../urpmf:46 ../urpmi:77 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - selgitav režiim.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - tõstutundetu igas olukorras.\n"
 
-#: ../urpmf:49
+#: ../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"
 
-#: ../urpmf:50
+#: ../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"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mustriavaldised:\n"
 
-#: ../urpmf:52
+#: ../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"
 
-#: ../urpmf:53
+#: ../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"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binaaroperaator AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binaaroperaator OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaaroperaator NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parem- ja vasakpoolne sulg.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Siltide nimekiri:\n"
 
-#: ../urpmf:59
+#: ../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"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   näide: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arhitektuur\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - valmistajamasin\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - valmistamisaeg\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfiguratsioonifailid\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - konfliktide sildid\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - paketi kirjeldus\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distributsioon\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epohh\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketi failinimi\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketi failide nimekiri\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupp\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - litsents\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - paketi nimi\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - iganenute sildid\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - paketi valmistaja\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - pakutavate sildid\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - nõutavate sildid\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - paigalduse suurus\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - lähtekoodi RPM-i nimi\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - pakkumiste sildid\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - kokkuvõte\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - tootja\n"
 
-#: ../urpmf:84
+#: ../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"
 
-#: ../urpmf:85 ../urpmq:94
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
 #, 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:197
+#: ../urpm/search.pm:197 ../urpmf:197
 #, 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:247 ../urpmi:253 ../urpmq:136
+#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "spetsiifilise keskkonna kasutamine %s puhul\n"
 
-#: ../urpmf:290
+#: ../urpm/search.pm:290 ../urpmf:290
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud hdlist-faili"
 
-#: ../urpmf:297
+#: ../urpm/search.pm:297 ../urpmf:297
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpmf:304
+#: ../urpm/search.pm:304 ../urpmf:306
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud XML-infot"
 
+#: ../urpm/select.pm:21
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"urpmi käivitati uuesti ja prioriteetsete pakettide nimekirja ei muudetud"
+
+#: ../urpm/select.pm:23
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi käivitati uuesti ja muudeti prioriteetsete pakettide nimekirja: %s %s "
+"asemel5"
+
+#: ../urpm/select.pm:184
+#, c-format
+msgid "No package named %s"
+msgstr "Paketti nimega %s ei ole"
+
+#: ../urpm/select.pm:186 ../urpme:107
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s sisaldub järgmistes pakettides: %s"
+
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
+#, c-format
+msgid "due to missing %s"
+msgstr "puuduva %s tõttu"
+
+#: ../urpm/select.pm:496
+#, c-format
+msgid "due to already installed %s"
+msgstr "juba paigaldatud %s tõttu"
+
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "rahuldamata %s tõttu"
+
+#: ../urpm/select.pm:503
+#, c-format
+msgid "trying to promote %s"
+msgstr "püüdes välja pakkuda %s"
+
+#: ../urpm/select.pm:504
+#, c-format
+msgid "in order to keep %s"
+msgstr "säilitamaks %s"
+
+#: ../urpm/select.pm:532
+#, c-format
+msgid "in order to install %s"
+msgstr "paigaldamaks %s"
+
+#: ../urpm/select.pm:542
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "konflikti tõttu %s-ga"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Vigane signatuur (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Vigane võtme ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Puudub signatuur (%s)"
+
+#: ../urpm/sys.pm:221
+#, c-format
+msgid "Can't write file"
+msgstr "Faili kirjutamine nurjus"
+
+#: ../urpm/sys.pm:221
+#, c-format
+msgid "Can't open file"
+msgstr "Faili avamine nurjus"
+
+#: ../urpm/sys.pm:234
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "%s kasutamine ei ole võimalik %s-ga"
+
+#: ../urpme:40
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versioon %s\n"
+"Autoriõigus © 1999-2006 Mandriva.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
+
+#: ../urpme:46
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
+
+#: ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
+"olemas.\n"
+
+#: ../urpme:49 ../urpmi:109 ../urpmq:67
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
+"masina.\n"
+
+#: ../urpme:50 ../urpmi:140
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
+
+#: ../urpme:51
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
+
+#: ../urpme:54
+#, 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  - seadistab urpme lennult distributsioonipuu põhjal,\n"
+"                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
+"root.\n"
+
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - selgitav režiim.\n"
+
+#: ../urpme:57
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
+
+#: ../urpme:70
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Tarkvara võib eemaldada ainult administraator"
+
+#: ../urpme:100
+#, c-format
+msgid "unknown packages"
+msgstr "tundmatud paketid"
+
+#: ../urpme:100
+#, c-format
+msgid "unknown package"
+msgstr "tundmatu pakett"
+
+#: ../urpme:113 ../urpmi:536
+#, c-format
+msgid "removing package %s will break your system"
+msgstr "paketi %s eemaldamine halvab Teie süsteemi"
+
+#: ../urpme:115
+#, c-format
+msgid "Nothing to remove"
+msgstr "Pole midagi eemaldada"
+
+#: ../urpme:120
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Kontrollitakse, kas on võimalik eemaldada järgmised paketid"
+
+#: ../urpme:124
+#, 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] "Sõltuvuste lahendamiseks tuleb eemaldada järgmine pakett"
+msgstr[1] "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti"
+
+#: ../urpme:128
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Kas eemaldada %d pakett?"
+msgstr[1] "Kas eemaldada %d paketti?"
+
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
+#, c-format
+msgid " (y/N) "
+msgstr " (j/E) "
+
+#: ../urpme:150
+#, c-format
+msgid "Removal failed"
+msgstr "Eemaldamine ebaõnnestus"
+
 #: ../urpmi:69
 #, c-format
 msgid ""
@@ -1820,7 +1865,8 @@ msgstr "  --fuzzy, -y    - lubab ebatäpset otsingut.\n"
 #: ../urpmi:98
 #, c-format
 msgid "  --buildrequires - install the buildrequires of the packages\n"
-msgstr "  --buildrequires - paigaldatakse pakettide ehitamiseks nõutavad paketid\n"
+msgstr ""
+"  --buildrequires - paigaldatakse pakettide ehitamiseks nõutavad paketid\n"
 
 #: ../urpmi:99
 #, c-format
@@ -1917,7 +1963,7 @@ msgstr "  --prozilla-options - prozilla lisavõtmed\n"
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - aria2 lisavõtmed\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:49 ../urpmi.update:36
+#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - piirab allalaadimiskiirust.\n"
@@ -1931,7 +1977,7 @@ msgstr ""
 "  --resume       - taasalustab osaliselt alla tõmmatud failide tõmbamist\n"
 "                   (--no-resume tühistab selle, vaikimisi on väljas).\n"
 
-#: ../urpmi:125 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:75
+#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1941,7 +1987,7 @@ msgstr ""
 "eeldatavalt\n"
 "                   vaikimisi 1080 (vorming on <puhverserver[:port]>).\n"
 
-#: ../urpmi:127 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:77
+#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2053,16 +2099,21 @@ msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - vaikne režiim.\n"
 
 #: ../urpmi:152
+#, fuzzy, c-format
+msgid "  --debug        - very verbose mode.\n"
+msgstr "  --verbose      - selgitav režiim.\n"
+
+#: ../urpmi:153
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  paigaldatakse käsureal antud nimed või RPM-failid.\n"
 
-#: ../urpmi:180
+#: ../urpmi:181
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Viga: võtit --auto-select ei saa kasutada koos pakettide loendiga.\n"
 
-#: ../urpmi:187
+#: ../urpmi:188
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2071,19 +2122,20 @@ msgstr ""
 "Viga: vearaporti loomiseks kasutage koos võtmega --bug\n"
 "tavalisi käsureaargumente.\n"
 
-#: ../urpmi:214
+#: ../urpmi:215
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Binaarseid RPM-faile ei saa paigaldada võtme --install-src kasutamisel"
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
-"palun kasutage võtit --buildrequires või --install-src, mis vaikimisi rakendab võtit --buildrequires"
+"palun kasutage võtit --buildrequires või --install-src, mis vaikimisi "
+"rakendab võtit --buildrequires"
 
-#: ../urpmi:240
+#: ../urpmi:241
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -2092,17 +2144,17 @@ msgstr ""
 "Kataloog [%s] on juba olemas, palun kasutage vearaportideks muud kataloogi "
 "või kustutage see"
 
-#: ../urpmi:241
+#: ../urpmi:242
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Keskkonna kataloogi %s ei ole olemas"
 
-#: ../urpmi:274
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2111,48 +2163,48 @@ msgstr ""
 "Viga: %s paistab olevat haagitud ainult loetavana.\n"
 "Kasutage operatsiooni pealesundimiseks võtit --allow-force."
 
-#: ../urpmi:361
+#: ../urpmi:362
 #, c-format
 msgid "Updating media...\n"
 msgstr "Andmekandja uuendamine...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uuendus)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uuendus)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:446
+#: ../urpmi:447
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (paigaldus)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:448
+#: ../urpmi:449
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (paigaldus)"
 
-#: ../urpmi:454
+#: ../urpmi:455
 #, 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:457
+#: ../urpmi:458
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Millise valite? (1-%d) "
 
-#: ../urpmi:498
+#: ../urpmi:499
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2163,7 +2215,7 @@ msgstr ""
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:501
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2174,7 +2226,7 @@ msgstr ""
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:507 ../urpmi:523
+#: ../urpmi:508 ../urpmi:524
 #, c-format
 msgid ""
 "\n"
@@ -2183,12 +2235,12 @@ msgstr ""
 "\n"
 "Kas siiski paigaldamist jätkata?"
 
-#: ../urpmi:508 ../urpmi:524 ../urpmi:612 ../urpmi.addmedia:125
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
 
-#: ../urpmi:516
+#: ../urpmi:517
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2197,7 +2249,7 @@ msgstr ""
 "Soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:517
+#: ../urpmi:518
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2206,7 +2258,7 @@ msgstr ""
 "Mõnda soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:544
+#: ../urpmi:545
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2217,7 +2269,7 @@ msgstr ""
 "järgmine pakett:\n"
 "%s\n"
 
-#: ../urpmi:546
+#: ../urpmi:547
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2228,7 +2280,7 @@ msgstr ""
 "järgmised paketid:\n"
 "%s\n"
 
-#: ../urpmi:553
+#: ../urpmi:554
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2237,7 +2289,7 @@ msgstr ""
 "Teiste uuendamiseks tuleb eemaldada järgmine pakett:\n"
 "%s"
 
-#: ../urpmi:554
+#: ../urpmi:555
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2246,55 +2298,55 @@ msgstr ""
 "Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
 "%s"
 
-#: ../urpmi:556
+#: ../urpmi:557
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei eemaldata)"
 
-#: ../urpmi:577
+#: ../urpmi:578
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
 "dependencies:\n"
 "%s\n"
 msgstr ""
-"Järgmiste sõltuvuste paigaldamiseks tuleb urpmi välja kutsuda võtmega "
-"--buildrequires:\n"
+"Järgmiste sõltuvuste paigaldamiseks tuleb urpmi välja kutsuda võtmega --"
+"buildrequires:\n"
 "%s\n"
 
-#: ../urpmi:594
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei paigaldata)"
 
-#: ../urpmi:600
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Kasutusele võetakse veel %s kettaruumi."
 
-#: ../urpmi:601
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Vabaneb %s kettaruumi."
 
-#: ../urpmi:602
+#: ../urpmi:603
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Kas paigaldada 1 pakett?"
 msgstr[1] "Kas paigaldada %d paketti?"
 
-#: ../urpmi:620
+#: ../urpmi:621
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Vajutage Enter, kui see on tehtud..."
 
-#: ../urpmi:625
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../urpmi:664
+#: ../urpmi:665
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
@@ -2302,7 +2354,7 @@ msgstr "urpmi taaskäivitamine"
 #. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
 #. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -2312,6 +2364,15 @@ msgid ""
 "       http://<host>/<path>\n"
 "       removable://<path>\n"
 "\n"
+"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
+"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
+"\n"
+"examples:\n"
+"\n"
+"  urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+"  urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+"\n"
+"\n"
 "and [options] are from\n"
 msgstr ""
 "kasutamine: urpmi.addmedia [võtmed] <nimi> <url>\n"
@@ -2324,53 +2385,54 @@ msgstr ""
 "\n"
 "ja [võti] on üks järgmistest\n"
 
-#: ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - wget kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - curl'i kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - prozilla kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi.addmedia:54
+#: ../urpmi.addmedia:63
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - loob uuendatava andmekandja.\n"
 
-#: ../urpmi.addmedia:55
+#: ../urpmi.addmedia:64
 #, 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"
 msgstr ""
-"  --xml-info     - konkreetse reegli kasutamine XML-info failide allalaadimisel\n"
-"                   reegel on üks järgmistest: never, on-demand, update-only, always. Vt urpmi."
-"cfg(5)\n"
+"  --xml-info     - konkreetse reegli kasutamine XML-info failide "
+"allalaadimisel\n"
+"                   reegel on üks järgmistest: never, on-demand, update-only, "
+"always. Vt urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:57
+#: ../urpmi.addmedia:66
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - kasutatakse sünteesifaili.\n"
 
-#: ../urpmi.addmedia:58
+#: ../urpmi.addmedia:67
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - kasutatakse RPM-faile (sünteesifaili asemel).\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:68
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - ei püüta kasutada sünteesifaili.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2378,21 +2440,21 @@ msgid ""
 msgstr ""
 "  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:72
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - koos võtmega --distrib küsib kinnitust iga andmekandja "
 "puhul\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:73
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media    - koos võtmega --distrib lisab kõik loetletud "
 "andmekandjad.\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:74
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2401,79 +2463,83 @@ msgstr ""
 "  --from         - kasutab määratud URL-i peeglite loendi jaoks, vaikimisi\n"
 "                   on see %s\n"
 
-#: ../urpmi.addmedia:67
-#, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+#: ../urpmi.addmedia:76
+#, fuzzy, c-format
+msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - loob virtuaalse andmekandja, mis on alati värske,\n"
 "                   lubatud on ainult protokoll file://.\n"
 
-#: ../urpmi.addmedia:69 ../urpmi.update:42
+#: ../urpmi.addmedia:77 ../urpmi.update:42
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:78
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - lisatud andmekandja avalikku võtit ei impordita\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - andmekandja lisatakse seadistustefaili, aga seda ei "
 "uuendata.\n"
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - puhastab päistepuhvri kataloogi.\n"
 
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - vaikne režiim.\n"
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - selgitav režiim.\n"
 
-#: ../urpmi.addmedia:94
+#: ../urpmi.addmedia:102
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "saadaolevad XML-info reeglid on %s"
 
-#: ../urpmi.addmedia:102
+#: ../urpmi.addmedia:113
+#, c-format
+msgid "no argument needed for --distrib --mirrorlist <url>"
+msgstr ""
+
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "vigane <url> (kohaliku kataloogi asukoht peab olema absoluutne)"
 
-#: ../urpmi.addmedia:105
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Andmekandjaid võib lisada ainult administraator"
 
-#: ../urpmi.addmedia:108
+#: ../urpmi.addmedia:125
 #, c-format
 msgid "creating config file [%s]"
 msgstr "luuakse seadistustefail [%s]"
 
-#: ../urpmi.addmedia:109
+#: ../urpmi.addmedia:126
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Seadistustefaili [%s] loomine ebaõnnestus"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:134
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
-"võtme --distrib puhul puudub vajadus anda <suhteline tee sünteesifaili juurde>"
+"võtme --distrib puhul puudub vajadus anda <suhteline tee sünteesifaili "
+"juurde>"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:142
 #, c-format
 msgid ""
 "\n"
@@ -2482,16 +2548,21 @@ msgstr ""
 "\n"
 "Kas soovite lisada andmekandja '%s'?"
 
-#: ../urpmi.addmedia:150
+#: ../urpmi.addmedia:168
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "Puudub <suhteline tee sünteesifaili juurde>\n"
 
-#: ../urpmi.addmedia:153
+#: ../urpmi.addmedia:171
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "%s kasutamine ei ole võimalik võrguandmekandjaga"
 
+#: ../urpmi.addmedia:183
+#, fuzzy, c-format
+msgid "unable to add medium"
+msgstr "ligipääs andmekandjale \"%s\" ebaõnnestus"
+
 #: ../urpmi.recover:28
 #, c-format
 msgid ""
@@ -2971,32 +3042,33 @@ msgstr "  päringu esitamine käsureal antud nimede või RPM-failide kohta.\n"
 msgid "--list-nodes can only be used with --parallel"
 msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
 
-#: ../urpmq:358
+#: ../urpmq:360
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 "andmekandjal \"%s\" puudub XML-info, paketil %s on ainult osaline tulemus"
 
-#: ../urpmq:359
+#: ../urpmq:361
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "andmekandjal \"%s\" puudub XML-info, pakettidel %s on ainult osaline tulemus"
 
-#: ../urpmq:362
+#: ../urpmq:364
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "andmekandjal \"%s\" puudub XML-info, paketile %s ei ole mingit tulemust"
+msgstr ""
+"andmekandjal \"%s\" puudub XML-info, paketile %s ei ole mingit tulemust"
 
-#: ../urpmq:363
+#: ../urpmq:365
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "andmekandjal \"%s\" puudub XML-info, pakettidele %s ei ole mingit tulemust"
 
-#: ../urpmq:427
+#: ../urpmq:429
 #, c-format
 msgid "No changelog found\n"
 msgstr "Muutuste logi ei leitud\n"
@@ -3080,9 +3152,6 @@ msgstr "Muutuste logi ei leitud\n"
 #~ msgid "no rpm files found from [%s]"
 #~ msgstr "[%s] ei sisalda RPM-faile"
 
-#~ msgid "reading rpm files from [%s]"
-#~ msgstr "[%s] RPM-failide lugemine"
-
 #~ msgid "unable to read rpm files from [%s]: %s"
 #~ msgstr "[%s] RPM-failide lugemine ebaõnnestus: %s"