sync with code

1 files changed, 382 insertions, 306 deletions

diff --git a/po/et.po b/po/et.po
index 39520680..5872c942 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-21 14:43+0200\n"
+"POT-Creation-Date: 2011-09-17 21:04+0200\n"
 "PO-Revision-Date: 2009-10-21 15:55+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -125,8 +126,8 @@ msgstr ""
 msgid "Options:"
 msgstr "Võtmed:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:81 ../urpmi.addmedia:54
-#: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:81 ../urpmi.addmedia:55
+#: ../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"
@@ -247,7 +248,7 @@ msgstr ""
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gurpmi2:146 ../urpmi:649
+#: ../gurpmi2:146 ../urpmi:651
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
@@ -288,13 +289,13 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:267 ../urpmi:614
+#: ../gurpmi2:267 ../urpmi:616
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
 
-#: ../gurpmi2:268 ../urpmi:615
+#: ../gurpmi2:268 ../urpmi:617
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -322,7 +323,7 @@ msgstr "Valmistumine..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../gurpmi2:334 ../urpmi:644
+#: ../gurpmi2:334 ../urpmi:646
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Palun sisestage andmekandja nimega \"%s\""
@@ -332,9 +333,9 @@ msgstr "Palun sisestage andmekandja nimega \"%s\""
 msgid "Downloading package `%s'..."
 msgstr "Paketi '%s' allalaadimine..."
 
-#: ../gurpmi2:360 ../urpm.pm:335 ../urpm/download.pm:822
-#: ../urpm/get_pkgs.pm:257 ../urpm/media.pm:913 ../urpm/media.pm:1413
-#: ../urpm/media.pm:1564
+#: ../gurpmi2:360 ../urpm.pm:335 ../urpm/download.pm:830
+#: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
+#: ../urpm/media.pm:1644
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...tõmbamine nurjus: %s"
@@ -355,7 +356,7 @@ msgstr ""
 "%s\n"
 "Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../gurpmi2:399 ../urpm/main_loop.pm:289 ../urpm/main_loop.pm:332
+#: ../gurpmi2:399 ../urpm/main_loop.pm:291 ../urpm/main_loop.pm:334
 #, c-format
 msgid "Installation failed:"
 msgstr "Paigaldamine nurjus:"
@@ -375,7 +376,7 @@ msgstr "Paigaldus lõpetatud"
 msgid "removing %s"
 msgstr "%s eemaldamine"
 
-#: ../gurpmi2:415 ../urpmi:715
+#: ../gurpmi2:415 ../urpmi:717
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
@@ -465,7 +466,7 @@ msgstr "vigane RPM-faili nimi [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-faili [%s] tõmbamine..."
 
-#: ../urpm.pm:332 ../urpm/get_pkgs.pm:255
+#: ../urpm.pm:332 ../urpm/get_pkgs.pm:260
 #, c-format
 msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
@@ -510,48 +511,48 @@ msgstr "käsureal on määratud vigane puhverserver\n"
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faili \"%s\" lugemine nurjus\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:389
 #, c-format
 msgid "unexpected expression %s"
 msgstr "ootamatu avaldis %s"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:390
 #, c-format
 msgid "missing expression before %s"
 msgstr "avaldis puudub %s ees"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:396
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "ootamatu avaldis %s (soovitus: kasutada võiks võtit -a või -o)"
 
-#: ../urpm/args.pm:388
+#: ../urpm/args.pm:400
 #, c-format
 msgid "no expression to close"
 msgstr "pole ühtegi avaldist lõpetada"
 
-#: ../urpm/args.pm:397
+#: ../urpm/args.pm:409
 #, c-format
 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:466
+#: ../urpm/args.pm:478
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kataloogi ei ole olemas"
 
-#: ../urpm/args.pm:489
+#: ../urpm/args.pm:501
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#: ../urpm/args.pm:492 ../urpm/args.pm:495 ../urpmq:159
+#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:159
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s kasutamine ei ole võimalik %s-ga"
 
-#: ../urpm/args.pm:503
+#: ../urpm/args.pm:515
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
@@ -600,7 +601,7 @@ msgstr "seadistustefaili [%s] lugemine nurjus"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "andmekandja '%s' on määratud kaks korda, loobutakse'"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:540
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:541
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "seadistustefaili [%s] kirjutamine nurjus"
@@ -610,138 +611,138 @@ msgstr "seadistustefaili [%s] kirjutamine nurjus"
 msgid "%s is not available, falling back on %s"
 msgstr "%s ei ole kättesaadav, kasutatakse %s"
 
-#: ../urpm/download.pm:157
+#: ../urpm/download.pm:165
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr "puhverserveri sätete lugemine nurjus (%s lugemiseks puuduvad õigused)"
 
-#: ../urpm/download.pm:182
+#: ../urpm/download.pm:190
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Palun anna oma tunnused puhverserveri kasutamiseks\n"
 
-#: ../urpm/download.pm:183
+#: ../urpm/download.pm:191
 #, c-format
 msgid "User name:"
 msgstr "Kasutajanimi:"
 
-#: ../urpm/download.pm:183
+#: ../urpm/download.pm:191
 #, c-format
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../urpm/download.pm:259
+#: ../urpm/download.pm:267
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "Tundmatu veebitõmbaja '%s'!\n"
 
-#: ../urpm/download.pm:267
+#: ../urpm/download.pm:275
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s nurjus: lõpetas signaaliga %d"
 
-#: ../urpm/download.pm:268
+#: ../urpm/download.pm:276
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "%s nurjus: lõpetas %d-ga"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:310
 #, c-format
 msgid "copy failed"
 msgstr "kopeerimine nurjus"
 
-#: ../urpm/download.pm:308
+#: ../urpm/download.pm:316
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget puudub\n"
 
-#: ../urpm/download.pm:375
+#: ../urpm/download.pm:383
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl puudub\n"
 
-#: ../urpm/download.pm:511
+#: ../urpm/download.pm:519
 #, c-format
 msgid "curl failed: upload canceled\n"
 msgstr "curl nurjus: üleslaadimine katkestati\n"
 
-#: ../urpm/download.pm:512
+#: ../urpm/download.pm:520
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl nurjus: allalaadimine katkestati\n"
 
-#: ../urpm/download.pm:547
+#: ../urpm/download.pm:555
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync puudub\n"
 
-#: ../urpm/download.pm:615
+#: ../urpm/download.pm:623
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh puudub\n"
 
-#: ../urpm/download.pm:634
+#: ../urpm/download.pm:642
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla puudub\n"
 
-#: ../urpm/download.pm:650
+#: ../urpm/download.pm:658
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Prozilla käivitamine nurjus\n"
 
-#: ../urpm/download.pm:660
+#: ../urpm/download.pm:668
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 puudub\n"
 
-#: ../urpm/download.pm:704
+#: ../urpm/download.pm:712
 #, c-format
 msgid "Failed to download %s"
 msgstr "%s allalaadimine nurjus"
 
-#: ../urpm/download.pm:799
+#: ../urpm/download.pm:807
 #, 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:800
+#: ../urpm/download.pm:808
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% valmis, kiirus: %s"
 
-#: ../urpm/download.pm:874
+#: ../urpm/download.pm:882
 #, c-format
 msgid "retrieving %s"
 msgstr "%s tõmbamine"
 
-#: ../urpm/download.pm:881
+#: ../urpm/download.pm:889
 #, c-format
 msgid "retrieved %s"
 msgstr "tõmmati %s"
 
-#: ../urpm/download.pm:945
+#: ../urpm/download.pm:953
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "tundmatu protokoll %s jaoks"
 
-#: ../urpm/download.pm:957
+#: ../urpm/download.pm:965
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
 
-#: ../urpm/download.pm:974
+#: ../urpm/download.pm:982
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ei suuda käsitleda protokolli: %s"
 
 #: ../urpm/dudf.pm:195
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "# Here are logs of your DUDF uploads.\n"
 "# Line format is : <date time of generation> <uid>\n"
 "# You can use uids to see the content of your uploads at this url :\n"
-"# http://dudf.forge.mandriva.com/"
+"# %s"
 msgstr ""
 "# Need on Teie DUDF-i üleslaadimiste logid.\n"
 "# Rea vorming on järgmine : <loomise kuupäev kellaaeg> <uid>\n"
@@ -793,8 +794,8 @@ msgstr ""
 "Te võite oma üleslaadimiste logisid näha asukohas\n"
 "\t"
 
-#: ../urpm/dudf.pm:360 ../urpm/msg.pm:76 ../urpmi:512 ../urpmi:527
-#: ../urpmi:634
+#: ../urpm/dudf.pm:360 ../urpm/msg.pm:76 ../urpmi:512 ../urpmi:528
+#: ../urpmi:636
 #, c-format
 msgid "Nn"
 msgstr "EeNn"
@@ -818,8 +819,8 @@ msgstr ""
 msgid "Do you want to upload a DUDF report to Mandriva?"
 msgstr "Kas soovite saata Mandrivale DUDF-i aruande?"
 
-#: ../urpm/dudf.pm:363 ../urpmi:514 ../urpmi:529 ../urpmi:635
-#: ../urpmi.addmedia:135
+#: ../urpm/dudf.pm:363 ../urpmi:515 ../urpmi:531 ../urpmi:637
+#: ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
@@ -848,7 +849,7 @@ msgstr "puhastatakse %s ja %s"
 msgid "package %s is not found."
 msgstr "paketti %s ei leitud."
 
-#: ../urpm/get_pkgs.pm:248
+#: ../urpm/get_pkgs.pm:253
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM-failide tõmbamine andmekandjalt \"%s\"..."
@@ -910,27 +911,27 @@ msgstr "paigaldatud RPM-failide (%s) eemaldamine %s-st"
 msgid "More information on package %s"
 msgstr "Rohkem infot paketi %s kohta"
 
-#: ../urpm/ldap.pm:70
+#: ../urpm/ldap.pm:71
 #, c-format
 msgid "Cannot create ldap cache directory"
 msgstr "LDAP puhvri kataloogi loomine nurjus"
 
-#: ../urpm/ldap.pm:72
+#: ../urpm/ldap.pm:73
 #, c-format
 msgid "Cannot write cache file for ldap\n"
 msgstr "LDAP-i puhvrifaili kirjutamine nurjus\n"
 
-#: ../urpm/ldap.pm:161
+#: ../urpm/ldap.pm:162
 #, c-format
 msgid "No server defined, missing uri or host"
 msgstr "Serverit pole määratud, URI või masin puudub"
 
-#: ../urpm/ldap.pm:162
+#: ../urpm/ldap.pm:163
 #, c-format
 msgid "No base defined"
 msgstr "Baas pole määratud"
 
-#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:173 ../urpm/ldap.pm:176
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Ühendus LDAP URI-ga nurjus:"
@@ -955,12 +956,12 @@ msgstr "%s andmebaas on lukus, seda kasutab juba protsess %d"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s andmebaas on lukus (seda kasutab teine programm)"
 
-#: ../urpm/main_loop.pm:77
+#: ../urpm/main_loop.pm:79
 #, c-format
 msgid "Retry?"
 msgstr "Kas proovida uuesti?"
 
-#: ../urpm/main_loop.pm:87
+#: ../urpm/main_loop.pm:89
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -969,12 +970,12 @@ msgstr ""
 "Paigaldamine nurjus, mõned failid on puudu:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:90
+#: ../urpm/main_loop.pm:92
 #, c-format
 msgid "You may need to update your urpmi database."
 msgstr "Te võiksite ehk uuendada urpmi andmebaasi."
 
-#: ../urpm/main_loop.pm:93
+#: ../urpm/main_loop.pm:95
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -983,7 +984,7 @@ msgstr ""
 "Paigaldamine nurjus, vigased RPM-failid:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:111
+#: ../urpm/main_loop.pm:113
 #, c-format
 msgid ""
 "There is not enough space on your filesystem to download all packages (%s "
@@ -994,118 +995,118 @@ msgstr ""
 "(vaja on %s, saadaval %s).\n"
 "Kas tõesti jätkata?"
 
-#: ../urpm/main_loop.pm:170 ../urpm/main_loop.pm:210 ../urpm/main_loop.pm:291
-#: ../urpm/main_loop.pm:298
+#: ../urpm/main_loop.pm:172 ../urpm/main_loop.pm:212 ../urpm/main_loop.pm:293
+#: ../urpm/main_loop.pm:300
 #, c-format
 msgid "Installation failed"
 msgstr "Paigaldamine nurjus"
 
-#: ../urpm/main_loop.pm:171
+#: ../urpm/main_loop.pm:173
 #, c-format
 msgid "Try to continue anyway?"
 msgstr "Kas proovida siiski jätkata?"
 
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:197
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Järgmisel paketil on vigane signatuur"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:198
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Järgmistel pakettidel on vigane signatuur"
 
-#: ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:199
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Kas jätkata paigaldusega?"
 
-#: ../urpm/main_loop.pm:214
+#: ../urpm/main_loop.pm:216
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "paigaldatud RPM-failide (%s) eemaldamine"
 
-#: ../urpm/main_loop.pm:234
+#: ../urpm/main_loop.pm:236
 #, c-format
 msgid "distributing %s"
 msgstr "%s jaotamine"
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:251
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s paigaldamine andmekandjalt %s"
 
-#: ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:253
 #, c-format
 msgid "installing %s"
 msgstr "%s paigaldamine"
 
-#: ../urpm/main_loop.pm:292
+#: ../urpm/main_loop.pm:294
 #, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata?"
 
-#: ../urpm/main_loop.pm:299
+#: ../urpm/main_loop.pm:301
 #, c-format
 msgid "Try harder to install (--force)?"
 msgstr "Kas proovida paigaldust veel jõulisemalt (--force)?"
 
-#: ../urpm/main_loop.pm:342
+#: ../urpm/main_loop.pm:344
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pole ühtegi paketti uuendada"
 
-#: ../urpm/main_loop.pm:353 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:355 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "Paigaldamine on võimalik"
 
-#: ../urpm/md5sum.pm:27
+#: ../urpm/md5sum.pm:26
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "hoiatus: MD5SUM failis puudub %s MD5 kontrollsumma"
 
-#: ../urpm/media.pm:257
+#: ../urpm/media.pm:258
 #, 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:259
+#: ../urpm/media.pm:260
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ligipääs \"%s\" nimekirjafailile nurjus, andmekandjat eiratakse"
 
-#: ../urpm/media.pm:262
+#: ../urpm/media.pm:263
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "ligipääs \"%s\" sünteesifailile nurjus, andmekandjat eiratakse"
 
-#: ../urpm/media.pm:288
+#: ../urpm/media.pm:289
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "püütakse vältida olemasolevat andmekandjat \"%s\""
 
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr "eemaldatava seadme migreerimine nurjus, andmekandjat eiratakse"
 
-#: ../urpm/media.pm:542
+#: ../urpm/media.pm:543
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "seadistustefaili [%s] kirjutamine"
 
-#: ../urpm/media.pm:585
+#: ../urpm/media.pm:586
 #, 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:593
+#: ../urpm/media.pm:594
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "seostatava andmekandja kasutamine paralleelrežiimis: %s"
 
-#: ../urpm/media.pm:609
+#: ../urpm/media.pm:610
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -1114,218 +1115,223 @@ msgstr ""
 "võtit --synthesis ei saa kasutada võtmega --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib või --parallel"
 
-#: ../urpm/media.pm:727
+#: ../urpm/media.pm:736
 #, c-format
 msgid "skipping package %s"
 msgstr "pakett %s jäetakse vahele"
 
-#: ../urpm/media.pm:743
+#: ../urpm/media.pm:752
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paketti %s ei uuendata, seda saab ainult paigaldada"
 
-#: ../urpm/media.pm:768
+#: ../urpm/media.pm:828
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "andmekandja \"%s\" on juba olemas"
 
-#: ../urpm/media.pm:807
+#: ../urpm/media.pm:869
 #, c-format
 msgid "(ignored by default)"
 msgstr "(vaikimisi eiratakse)"
 
-#: ../urpm/media.pm:813
+#: ../urpm/media.pm:875
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine enne võrguandmekandjat \"%s\""
 
-#: ../urpm/media.pm:819
+#: ../urpm/media.pm:881
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:905
 #, c-format
 msgid "failed to copy media.cfg to %s (%d)"
 msgstr "media.cfg kopeerimine asukohta %s (%d) nurjus"
 
-#: ../urpm/media.pm:884
+#: ../urpm/media.pm:947
 #, c-format
 msgid "directory %s does not exist"
 msgstr "kataloogi %s ei ole olemas"
 
-#: ../urpm/media.pm:892
+#: ../urpm/media.pm:955
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "see asukoht ei paista sisaldavat ühtegi distributsiooni"
 
-#: ../urpm/media.pm:911
+#: ../urpm/media.pm:979
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "faili media.cfg parsimine nurjus"
 
-#: ../urpm/media.pm:914
+#: ../urpm/media.pm:982
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "ligipääs distributsiooniandmekandjale nurjus (ei leitud faili media.cfg)"
 
-#: ../urpm/media.pm:932
+#: ../urpm/media.pm:1003
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "jäetakse vahele mitteühilduv andmekandja '%s' (%s)"
 
-#: ../urpm/media.pm:983
+#: ../urpm/media.pm:1018
+#, fuzzy, c-format
+msgid "ignoring non-free medium `%s'"
+msgstr "andmekandja %s ignoreerimine"
+
+#: ../urpm/media.pm:1061
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "faili media.cfg tõmbamine..."
 
-#: ../urpm/media.pm:1024
+#: ../urpm/media.pm:1104
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "püüti valida olematut andmekandjat \"%s\""
 
-#: ../urpm/media.pm:1027
+#: ../urpm/media.pm:1107
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "mitme andmekandja valik: %s"
 
-#: ../urpm/media.pm:1086
+#: ../urpm/media.pm:1166
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "andmekandja \"%s\" eemaldamine"
 
-#: ../urpm/media.pm:1169
+#: ../urpm/media.pm:1249
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "urpmi ümberseadistamine andmekandja \"%s\" tarbeks"
 
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1283
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ümberseadistamine nurjus"
 
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1289
 #, c-format
 msgid "reconfiguration done"
 msgstr "ümberseadistamine tehtud"
 
-#: ../urpm/media.pm:1225
+#: ../urpm/media.pm:1305
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Viga nimedefaili loomisel: sõltuvust %d ei leitud"
 
-#: ../urpm/media.pm:1246
+#: ../urpm/media.pm:1326
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "andmekandja \"%s\" on täiesti värske"
 
-#: ../urpm/media.pm:1257
+#: ../urpm/media.pm:1337
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sünteesifaili [%s] uurimine"
 
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1357
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
 
-#: ../urpm/media.pm:1290 ../urpm/media.pm:1385
+#: ../urpm/media.pm:1370 ../urpm/media.pm:1465
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopeeritakse [%s] andmekandjale \"%s\"..."
 
-#: ../urpm/media.pm:1292 ../urpm/media.pm:1362 ../urpm/media.pm:1615
+#: ../urpm/media.pm:1372 ../urpm/media.pm:1442 ../urpm/media.pm:1695
 #, c-format
 msgid "...copying failed"
 msgstr "...kopeerimine nurjus"
 
-#: ../urpm/media.pm:1358
+#: ../urpm/media.pm:1438
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" kirjelduste faili kopeerimine..."
 
-#: ../urpm/media.pm:1360 ../urpm/media.pm:1389
+#: ../urpm/media.pm:1440 ../urpm/media.pm:1469
 #, c-format
 msgid "...copying done"
 msgstr "...kopeerimine tehtud"
 
-#: ../urpm/media.pm:1391
+#: ../urpm/media.pm:1471
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopeerimine nurjus (fail on kahtlaselt väike)"
 
-#: ../urpm/media.pm:1439
+#: ../urpm/media.pm:1519
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "tõmmatud allika sünteesifaili MD5SUM arvutamine"
 
-#: ../urpm/media.pm:1441 ../urpm/media.pm:1881
+#: ../urpm/media.pm:1521 ../urpm/media.pm:1961
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] tõmbamine nurjus (MD5SUM ei klapi)"
 
-#: ../urpm/media.pm:1456
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 nurjus %s puhul"
 
-#: ../urpm/media.pm:1466
+#: ../urpm/media.pm:1546
 #, c-format
 msgid "comparing %s and %s"
 msgstr "%s ja %s võrdlemine"
 
-#: ../urpm/media.pm:1496
+#: ../urpm/media.pm:1576
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "vigane hdlist-fail %s andmekandjale \"%s\""
 
-#: ../urpm/media.pm:1522
+#: ../urpm/media.pm:1602
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" MD5SUM-faili kopeerimine..."
 
-#: ../urpm/media.pm:1562
+#: ../urpm/media.pm:1642
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "vigane MD5SUM-fail (alla laaditud asukohast %s)"
 
-#: ../urpm/media.pm:1565
+#: ../urpm/media.pm:1645
 #, c-format
 msgid "no metadata found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud metaandmeid"
 
-#: ../urpm/media.pm:1597
+#: ../urpm/media.pm:1677
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" allika sünteesifaili tõmbamine..."
 
-#: ../urpm/media.pm:1663
+#: ../urpm/media.pm:1743
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" avaliku võtme faili uurimine..."
 
-#: ../urpm/media.pm:1675
+#: ../urpm/media.pm:1755
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
 
-#: ../urpm/media.pm:1679
+#: ../urpm/media.pm:1759
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" avaliku võtme faili import nurjus"
 
-#: ../urpm/media.pm:1720
+#: ../urpm/media.pm:1800
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpm/media.pm:1753
+#: ../urpm/media.pm:1833
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uuendati andmekandjat \"%s\""
 
-#: ../urpm/media.pm:1875
+#: ../urpm/media.pm:1955
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] tõmbamine nurjus"
@@ -1340,24 +1346,24 @@ 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:231
+#: ../urpm/mirrors.pm:234
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "leiti geolokatsioon %s %.2f %.2f ajavööndist %s"
 
-#: ../urpm/mirrors.pm:276
+#: ../urpm/mirrors.pm:279
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "%s peeglite nimekirja lugemine"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:564 ../urpmi:672 ../urpmi:682
-#: ../urpmi.addmedia:132
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:566 ../urpmi:674 ../urpmi:684
+#: ../urpmi.addmedia:133
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:135
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:136
 #, c-format
 msgid " (y/N) "
 msgstr " (j/E) "
@@ -1432,7 +1438,27 @@ msgstr "TB"
 msgid "Marking %s as manually installed, it won't be auto-orphaned"
 msgstr "%s märgitakse käsitsi paigaldatuks, seda ei tunnistata enam orvuks"
 
-#: ../urpm/orphans.pm:426
+#: ../urpm/orphans.pm:449
+#, fuzzy, c-format
+msgid ""
+"The following package:\n"
+"%s\n"
+"is now orphaned."
+msgid_plural ""
+"The following packages:\n"
+"%s\n"
+"are now orphaned."
+msgstr[0] "Vajalik on üks järgnevatest pakettidest:"
+msgstr[1] "Vajalik on üks järgnevatest pakettidest:"
+
+#: ../urpm/orphans.pm:452
+#, fuzzy, c-format
+msgid "You may wish to remove it."
+msgid_plural "You may wish to remove them."
+msgstr[0] "Pole ühtegi orbu eemaldada"
+msgstr[1] "Pole ühtegi orbu eemaldada"
+
+#: ../urpm/orphans.pm:461
 #, c-format
 msgid ""
 "The following package:\n"
@@ -1720,8 +1746,8 @@ 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:120 ../urpmi.addmedia:72
-#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:72
+#: ../urpme:54 ../urpmf:40 ../urpmi:120 ../urpmi.addmedia:73
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:72
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
@@ -1829,10 +1855,10 @@ msgid "Removal is possible"
 msgstr "Eemaldamine on võimalik"
 
 #: ../urpmf:29
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
+"Copyright (C) 2002-2010 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -2255,7 +2281,7 @@ msgstr ""
 "  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal,\n"
 "                   kasulik chroot paigaldamiseks võtmega --root.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:59 ../urpmi.update:37
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr "  --metalink     - kohaliku metalingi loomine ja kasutamine.\n"
@@ -2303,7 +2329,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:133 ../urpmi.addmedia:60 ../urpmi.update:38
+#: ../urpmi:133 ../urpmi.addmedia:61 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - piirab allalaadimiskiirust.\n"
@@ -2317,7 +2343,7 @@ msgstr ""
 "  --resume       - taasalustab osaliselt alla tõmmatud failide tõmbamist\n"
 "                   (--no-resume tühistab selle, vaikimisi on väljas).\n"
 
-#: ../urpmi:136 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:136 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2327,7 +2353,7 @@ msgstr ""
 "eeldatavalt\n"
 "                   vaikimisi 1080 (vorming on <puhverserver[:port]>).\n"
 
-#: ../urpmi:138 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:80
+#: ../urpmi:138 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:80
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2544,7 +2570,7 @@ msgstr ""
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:513 ../urpmi:528
+#: ../urpmi:514 ../urpmi:530
 #, c-format
 msgid ""
 "\n"
@@ -2553,7 +2579,7 @@ msgstr ""
 "\n"
 "Kas siiski paigaldamist jätkata?"
 
-#: ../urpmi:522
+#: ../urpmi:523
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2562,7 +2588,7 @@ msgstr ""
 "Soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:523
+#: ../urpmi:524
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2571,12 +2597,12 @@ msgstr ""
 "Mõnda soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:540
+#: ../urpmi:542
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketi %s eemaldamine halvab Teie süsteemi"
 
-#: ../urpmi:548
+#: ../urpmi:550
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2587,7 +2613,7 @@ msgstr ""
 "järgmine pakett:\n"
 "%s\n"
 
-#: ../urpmi:550
+#: ../urpmi:552
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2598,12 +2624,12 @@ msgstr ""
 "järgmised paketid:\n"
 "%s\n"
 
-#: ../urpmi:559
+#: ../urpmi:561
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei eemaldata)"
 
-#: ../urpmi:579
+#: ../urpmi:581
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2614,46 +2640,46 @@ msgstr ""
 "buildrequires:\n"
 "%s\n"
 
-#: ../urpmi:589
+#: ../urpmi:591
 #, 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:617
+#: ../urpmi:619
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei paigaldata)"
 
-#: ../urpmi:623
+#: ../urpmi:625
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Kasutusele võetakse veel %s kettaruumi."
 
-#: ../urpmi:624
+#: ../urpmi:626
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Vabaneb %s kettaruumi."
 
-#: ../urpmi:625
+#: ../urpmi:627
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Tõmmatakse %s andmeid."
 
-#: ../urpmi:626
+#: ../urpmi:628
 #, 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:649
+#: ../urpmi:651
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../urpmi:657
+#: ../urpmi:659
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Vajutage Enter, kui see on tehtud..."
@@ -2661,7 +2687,7 @@ msgstr "Vajutage Enter, kui see on tehtud..."
 #. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' 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"
@@ -2678,6 +2704,7 @@ msgid ""
 "\n"
 "  urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
 "  urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+"  urpmi.addmedia --distrib --zeroconf\n"
 "\n"
 "\n"
 "and [options] are from\n"
@@ -2702,27 +2729,27 @@ msgstr ""
 "\n"
 "ja [võti] on üks järgmistest\n"
 
-#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:75
+#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:75
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - wget kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:76
+#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:76
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - curl'i kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:77
+#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:77
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - prozilla kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi.addmedia:58 ../urpmi.update:36
+#: ../urpmi.addmedia:59 ../urpmi.update:36
 #, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --aria2        - aria2 kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:66
 #, c-format
 msgid ""
 "  --update       - create an update medium, \n"
@@ -2732,7 +2759,7 @@ msgstr ""
 "                   või mitte-uuendusandmekandjate tühistamine (koos võtmega "
 "--distrib)\n"
 
-#: ../urpmi.addmedia:67
+#: ../urpmi.addmedia:68
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2744,22 +2771,22 @@ msgstr ""
 "                   reegel on üks järgmistest: never, on-demand, update-only, "
 "always. Vt urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - kasutatakse sünteesifaili.\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - kasutatakse RPM-faile (sünteesifaili asemel).\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:72
 #, 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:73
+#: ../urpmi.addmedia:74
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2767,90 +2794,90 @@ msgid ""
 msgstr ""
 "  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, 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:76
+#: ../urpmi.addmedia:77
 #, 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:77
+#: ../urpmi.addmedia:78
 #, 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"
 
-#: ../urpmi.addmedia:78 ../urpmi.update:44
+#: ../urpmi.addmedia:79 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
 
-#: ../urpmi.addmedia:79
+#: ../urpmi.addmedia:80
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - lisatud andmekandja avalikku võtit ei impordita\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, 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:81 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - vaikne režiim.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - selgitav režiim.\n"
 
-#: ../urpmi.addmedia:95
+#: ../urpmi.addmedia:96
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "saadaolevad XML-info reeglid on %s"
 
-#: ../urpmi.addmedia:106
+#: ../urpmi.addmedia:107
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "--distrib --mirrorlist <url> ei vaja mingeid argumente"
 
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:112
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "vigane <url> (kohaliku kataloogi asukoht peab olema absoluutne)"
 
-#: ../urpmi.addmedia:115
+#: ../urpmi.addmedia:116
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Andmekandjaid võib lisada ainult administraator"
 
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:119
 #, c-format
 msgid "creating config file [%s]"
 msgstr "luuakse seadistustefail [%s]"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Seadistustefaili [%s] loomine nurjus"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, 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>"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid ""
 "\n"
@@ -2859,21 +2886,165 @@ msgstr ""
 "\n"
 "Kas soovite lisada andmekandja '%s'?"
 
-#: ../urpmi.addmedia:153 ../urpmi.addmedia:176
+#: ../urpmi.addmedia:155 ../urpmi.addmedia:179
 #, c-format
 msgid "unable to add medium"
 msgstr "andmekandja lisamine nurjus"
 
-#: ../urpmi.addmedia:161
+#: ../urpmi.addmedia:163
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "Puudub <suhteline tee sünteesifaili juurde>\n"
 
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:166
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "%s kasutamine ei ole võimalik võrguandmekandjaga"
 
+#: ../urpmi.recover:28
+#, fuzzy, c-format
+msgid ""
+"urpmi.recover version %s\n"
+"Copyright (C) 2006-2010 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi.recover versioon %s\n"
+"Autoriõigus © 2006 Mandriva.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
+
+#: ../urpmi.recover:34
+#, c-format
+msgid "  --checkpoint   - set repackaging start now\n"
+msgstr "  --checkpoint   - määrab taaspakendamise alguspunkti\n"
+
+#: ../urpmi.recover:35
+#, c-format
+msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
+msgstr ""
+"  --noclean      - taaspakendamise kataloogi kontrollpunktis ei puhastata\n"
+
+#: ../urpmi.recover:37
+#, c-format
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
+msgstr ""
+"  --list         - tehingute nimekiri alates määratud kuupäevast/"
+"ajavahemikus\n"
+
+#: ../urpmi.recover:38
+#, c-format
+msgid "  --list-all     - list all transactions in rpmdb (long)\n"
+msgstr ""
+"  --list-all     - kõigi RPM-ide andmebaasis olevate tehingute nimekiri "
+"(pikk)\n"
+
+#: ../urpmi.recover:39
+#, c-format
+msgid "  --list-safe    - list transactions since checkpoint\n"
+msgstr "  --list-safe    - kõigi tehingute nimekiri alates kontrollpunktist\n"
+
+#: ../urpmi.recover:40
+#, c-format
+msgid ""
+"  --rollback     - rollback until specified date,\n"
+"                   or rollback the specified number of transactions\n"
+msgstr ""
+"  --rollback     - taastamine konkreetse kuupäeva järgi\n"
+"                   või määratud tehingute arvu järgi\n"
+
+#: ../urpmi.recover:42
+#, c-format
+msgid "  --disable      - turn off repackaging\n"
+msgstr "  --disable      - taaspakendamine keelatakse\n"
+
+#: ../urpmi.recover:57
+#, c-format
+msgid "Invalid date or duration [%s]\n"
+msgstr "Vigane kuupäev või kestvus [%s]\n"
+
+#: ../urpmi.recover:65
+#, c-format
+msgid "Repackage directory not defined\n"
+msgstr "Taaspakendamiskataloog pole määratud\n"
+
+#: ../urpmi.recover:68
+#, c-format
+msgid "Can't write to repackage directory [%s]\n"
+msgstr "Kirjutamine taaspakendamiskataloogi nurjus [%s]\n"
+
+#: ../urpmi.recover:70
+#, c-format
+msgid "Cleaning up repackage directory [%s]...\n"
+msgstr "Taaspakendamiskataloogi puhastamine [%s]...\n"
+
+#: ../urpmi.recover:72
+#, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d fail eemaldatud\n"
+msgstr[1] "%d faili eemaldatud\n"
+
+#: ../urpmi.recover:82
+#, c-format
+msgid "Spurious command-line arguments [%s]\n"
+msgstr "Vigased käsureaargumendid [%s]\n"
+
+#: ../urpmi.recover:84
+#, c-format
+msgid "You can't specify --checkpoint and --rollback at the same time\n"
+msgstr "Korraga ei saa kasutada võtit --checkpoint ja --rollback\n"
+
+#: ../urpmi.recover:86
+#, c-format
+msgid "You can't specify --checkpoint and --list at the same time\n"
+msgstr "Korraga ei saa kasutada võtit --checkpoint ja --list\n"
+
+#: ../urpmi.recover:88
+#, c-format
+msgid "You can't specify --rollback and --list at the same time\n"
+msgstr "Korraga ei saa kasutada võtit --rollback ja --list\n"
+
+#: ../urpmi.recover:90
+#, c-format
+msgid "You can't specify --disable along with another option"
+msgstr "Võtit --disable ei saa kasutada koos teiste võtmetega"
+
+#: ../urpmi.recover:115
+#, c-format
+msgid "No transaction found since %s\n"
+msgstr "Ei leitud ühtegi tehingut alates %s\n"
+
+#: ../urpmi.recover:130
+#, c-format
+msgid "You must be superuser to do this"
+msgstr "Selleks peavad olema administraatori õigused"
+
+#: ../urpmi.recover:143 ../urpmi.recover:209
+#, c-format
+msgid "Writing rpm macros file [%s]...\n"
+msgstr "RPM-i makrofaili kirjutamine [%s]...\n"
+
+#: ../urpmi.recover:185
+#, c-format
+msgid "No rollback date found\n"
+msgstr "Taastamiskuupäeva ei leitud\n"
+
+#: ../urpmi.recover:188
+#, c-format
+msgid "Rollback until %s...\n"
+msgstr "Taastamine seisuga %s...\n"
+
+#: ../urpmi.recover:195
+#, c-format
+msgid "Disabling repackaging\n"
+msgstr "Taaspakendamise keelamine\n"
+
 #: ../urpmi.removemedia:38
 #, c-format
 msgid ""
@@ -2898,12 +3069,12 @@ msgstr "  -y             - andmekandjate ligilähedane sobivus.\n"
 msgid "Only superuser is allowed to remove media"
 msgstr "Andmekandjaid võib eemaldada ainult administraator"
 
-#: ../urpmi.removemedia:72
+#: ../urpmi.removemedia:71
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "ei ole midagi eemaldada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:77
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2998,10 +3169,10 @@ msgid "enabling media %s"
 msgstr "andmekandja %s arvestamine"
 
 #: ../urpmq:40
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000-2006 Mandriva.\n"
+"Copyright (C) 2000-2010 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -3084,12 +3255,9 @@ msgstr ""
 "  --src          - järgmine pakett on lähtetekstipakett (sama, mis -s).\n"
 
 #: ../urpmq:67
-#, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - näitab enne allalaadimist kõiki lähtetekstipakette "
-"(ainult administraator).\n"
+#, fuzzy, c-format
+msgid "  --sources      - print source URLs of selected packages\n"
+msgstr "  --sourcerpm    - näitab lähtekoodi RPM-i nime.\n"
 
 #: ../urpmq:69
 #, c-format
@@ -3254,33 +3422,33 @@ msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
 msgid "use -l to list files"
 msgstr "faililoendi nägemiseks kasutage võtit -l"
 
-#: ../urpmq:423
+#: ../urpmq:424
 #, 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:424
+#: ../urpmq:425
 #, 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:427
+#: ../urpmq:428
 #, 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"
 
-#: ../urpmq:428
+#: ../urpmq:429
 #, 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:495
+#: ../urpmq:496
 #, c-format
 msgid "No changelog found\n"
 msgstr "Muutuste logi ei leitud\n"
@@ -3293,6 +3461,13 @@ msgstr "Graafiline kasutajaliides pakettide paigaldamiseks"
 msgid "Software Installer"
 msgstr "Tarkvara paigaldaja"
 
+#~ msgid ""
+#~ "  --sources      - give all source packages before downloading (root "
+#~ "only).\n"
+#~ msgstr ""
+#~ "  --sources      - näitab enne allalaadimist kõiki lähtetekstipakette "
+#~ "(ainult administraator).\n"
+
 #~ msgid "due to already installed %s"
 #~ msgstr "juba paigaldatud %s tõttu"
 
@@ -3307,105 +3482,6 @@ msgstr "Tarkvara paigaldaja"
 #~ "vaikimisi\n"
 #~ "                   on see %s\n"
 
-#~ 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"
-#~ "\n"
-#~ "usage:\n"
-#~ msgstr ""
-#~ "urpmi.recover versioon %s\n"
-#~ "Autoriõigus © 2006 Mandriva.\n"
-#~ "See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-#~ "Litsentsi tingimustele.\n"
-#~ "\n"
-#~ "kasutamine:\n"
-
-#~ msgid "  --checkpoint   - set repackaging start now\n"
-#~ msgstr "  --checkpoint   - määrab taaspakendamise alguspunkti\n"
-
-#~ msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-#~ msgstr ""
-#~ "  --noclean      - taaspakendamise kataloogi kontrollpunktis ei "
-#~ "puhastata\n"
-
-#~ msgid ""
-#~ "  --list         - list transactions since provided date/duration "
-#~ "argument\n"
-#~ msgstr ""
-#~ "  --list         - tehingute nimekiri alates määratud kuupäevast/"
-#~ "ajavahemikus\n"
-
-#~ msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-#~ msgstr ""
-#~ "  --list-all     - kõigi RPM-ide andmebaasis olevate tehingute nimekiri "
-#~ "(pikk)\n"
-
-#~ msgid "  --list-safe    - list transactions since checkpoint\n"
-#~ msgstr ""
-#~ "  --list-safe    - kõigi tehingute nimekiri alates kontrollpunktist\n"
-
-#~ msgid ""
-#~ "  --rollback     - rollback until specified date,\n"
-#~ "                   or rollback the specified number of transactions\n"
-#~ msgstr ""
-#~ "  --rollback     - taastamine konkreetse kuupäeva järgi\n"
-#~ "                   või määratud tehingute arvu järgi\n"
-
-#~ msgid "  --disable      - turn off repackaging\n"
-#~ msgstr "  --disable      - taaspakendamine keelatakse\n"
-
-#~ msgid "Invalid date or duration [%s]\n"
-#~ msgstr "Vigane kuupäev või kestvus [%s]\n"
-
-#~ msgid "Repackage directory not defined\n"
-#~ msgstr "Taaspakendamiskataloog pole määratud\n"
-
-#~ msgid "Can't write to repackage directory [%s]\n"
-#~ msgstr "Kirjutamine taaspakendamiskataloogi nurjus [%s]\n"
-
-#~ msgid "Cleaning up repackage directory [%s]...\n"
-#~ msgstr "Taaspakendamiskataloogi puhastamine [%s]...\n"
-
-#~ msgid "%d file removed\n"
-#~ msgid_plural "%d files removed\n"
-#~ msgstr[0] "%d fail eemaldatud\n"
-#~ msgstr[1] "%d faili eemaldatud\n"
-
-#~ msgid "Spurious command-line arguments [%s]\n"
-#~ msgstr "Vigased käsureaargumendid [%s]\n"
-
-#~ msgid "You can't specify --checkpoint and --rollback at the same time\n"
-#~ msgstr "Korraga ei saa kasutada võtit --checkpoint ja --rollback\n"
-
-#~ msgid "You can't specify --checkpoint and --list at the same time\n"
-#~ msgstr "Korraga ei saa kasutada võtit --checkpoint ja --list\n"
-
-#~ msgid "You can't specify --rollback and --list at the same time\n"
-#~ msgstr "Korraga ei saa kasutada võtit --rollback ja --list\n"
-
-#~ msgid "You can't specify --disable along with another option"
-#~ msgstr "Võtit --disable ei saa kasutada koos teiste võtmetega"
-
-#~ msgid "No transaction found since %s\n"
-#~ msgstr "Ei leitud ühtegi tehingut alates %s\n"
-
-#~ msgid "You must be superuser to do this"
-#~ msgstr "Selleks peavad olema administraatori õigused"
-
-#~ msgid "Writing rpm macros file [%s]...\n"
-#~ msgstr "RPM-i makrofaili kirjutamine [%s]...\n"
-
-#~ msgid "No rollback date found\n"
-#~ msgstr "Taastamiskuupäeva ei leitud\n"
-
-#~ msgid "Rollback until %s...\n"
-#~ msgstr "Taastamine seisuga %s...\n"
-
-#~ msgid "Disabling repackaging\n"
-#~ msgstr "Taaspakendamise keelamine\n"
-
 #~ msgid "Updating media...\n"
 #~ msgstr "Andmekandja uuendamine...\n"