sync with code

1 files changed, 362 insertions, 388 deletions

diff --git a/po/et.po b/po/et.po
index 521f09ce..b15b9208 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-28 15:12+0100\n"
+"POT-Creation-Date: 2009-03-30 16:09+0200\n"
 "PO-Revision-Date: 2009-03-04 11:48+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -27,7 +27,7 @@ msgstr "RPM-i paigaldamine"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Viga: faili %s ei leitud, toiming katkestatakse"
 
-#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
+#: ../gurpmi:47 ../gurpmi2:187 ../gurpmi2:212
 #, c-format
 msgid "_Ok"
 msgstr "_Olgu"
@@ -93,7 +93,7 @@ msgstr "_Paigalda"
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../gurpmi:101 ../gurpmi2:186
+#: ../gurpmi:101 ../gurpmi2:187
 #, c-format
 msgid "_Cancel"
 msgstr "_Loobu"
@@ -126,7 +126,7 @@ msgid "Options:"
 msgstr "Võtmed:"
 
 #: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../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,37 +247,37 @@ msgstr ""
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gurpmi2:146 ../urpmi:612
+#: ../gurpmi2:146 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../gurpmi2:182
+#: ../gurpmi2:183
 #, c-format
 msgid " (to upgrade)"
 msgstr " (uuendus)"
 
-#: ../gurpmi2:183
+#: ../gurpmi2:184
 #, c-format
 msgid " (to install)"
 msgstr " (paigaldus)"
 
-#: ../gurpmi2:186
+#: ../gurpmi2:187
 #, c-format
 msgid "Package choice"
 msgstr "Paketivalik"
 
-#: ../gurpmi2:187
+#: ../gurpmi2:188
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../gurpmi2:211
+#: ../gurpmi2:213
 #, c-format
 msgid "_Abort"
 msgstr "_Katkesta"
 
-#: ../gurpmi2:234
+#: ../gurpmi2:248
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -288,63 +288,63 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:253 ../urpmi:579
+#: ../gurpmi2:267 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
 
-#: ../gurpmi2:254 ../urpmi:580
+#: ../gurpmi2:268 ../urpmi:594
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid:"
 
-#: ../gurpmi2:256
+#: ../gurpmi2:270
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakett, %d MB)"
 msgstr[1] "(%d paketti, %d MB)"
 
-#: ../gurpmi2:264 ../urpm/main_loop.pm:49
+#: ../gurpmi2:278 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "pakette ei õnnestunud hankida, katkestatakse"
 
-#: ../gurpmi2:296 ../urpm/install.pm:80
+#: ../gurpmi2:310 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
-#: ../gurpmi2:302
+#: ../gurpmi2:316
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../gurpmi2:319 ../urpmi:607
+#: ../gurpmi2:333 ../urpmi:621
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Palun sisestage andmekandja nimega \"%s\""
 
-#: ../gurpmi2:333
+#: ../gurpmi2:347
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Paketi '%s' allalaadimine..."
 
-#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
-#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
+#: ../gurpmi2:359 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:810 ../urpm/media.pm:1271
+#: ../urpm/media.pm:1422
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...tõmbamine nurjus: %s"
 
-#: ../gurpmi2:361
+#: ../gurpmi2:375
 #, c-format
 msgid "_Done"
 msgstr "_Tehtud"
 
-#: ../gurpmi2:369 ../urpm/main_loop.pm:120
+#: ../gurpmi2:391
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -355,27 +355,27 @@ msgstr ""
 "%s\n"
 "Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
+#: ../gurpmi2:397 ../urpm/main_loop.pm:250 ../urpm/main_loop.pm:290
 #, c-format
 msgid "Installation failed:"
 msgstr "Paigaldamine nurjus:"
 
-#: ../gurpmi2:380
+#: ../gurpmi2:402
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Kõik on juba paigaldatud"
 
-#: ../gurpmi2:382
+#: ../gurpmi2:404
 #, c-format
 msgid "Installation finished"
 msgstr "Paigaldus lõpetatud"
 
-#: ../gurpmi2:383 ../urpme:169
+#: ../gurpmi2:405 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s eemaldamine"
 
-#: ../gurpmi2:391 ../urpmi:674
+#: ../gurpmi2:413 ../urpmi:688
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
@@ -465,7 +465,7 @@ msgstr "vigane RPM-faili nimi [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-faili [%s] tõmbamine..."
 
-#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:234
 #, c-format
 msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
@@ -495,7 +495,7 @@ msgstr "Sobimatu arhitektuur RPM-ile [%s]"
 msgid "error registering local packages"
 msgstr "viga kohalike pakettide registreerimisel"
 
-#: ../urpm.pm:438
+#: ../urpm.pm:439
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "See operatsioon on piiratud režiimis keelatud"
@@ -510,58 +510,58 @@ 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:383
+#: ../urpm/args.pm:371
 #, c-format
 msgid "unexpected expression %s"
 msgstr "ootamatu avaldis %s"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:372
 #, c-format
 msgid "missing expression before %s"
 msgstr "avaldis puudub %s ees"
 
-#: ../urpm/args.pm:390
+#: ../urpm/args.pm:378
 #, 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:394
+#: ../urpm/args.pm:382
 #, c-format
 msgid "no expression to close"
 msgstr "pole ühtegi avaldist lõpetada"
 
-#: ../urpm/args.pm:403
+#: ../urpm/args.pm:391
 #, 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:472
+#: ../urpm/args.pm:460
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kataloogi ei ole olemas"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:483
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
+#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s kasutamine ei ole võimalik %s-ga"
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:497
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
 
-#: ../urpm/bug_report.pm:54 ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Kopeerimine nurjus"
 
-#: ../urpm/cdrom.pm:66
+#: ../urpm/cdrom.pm:67
 #, c-format
 msgid ""
 "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
@@ -570,17 +570,17 @@ msgstr ""
 "Te peate CD-ROM-i käsitsi haakima (või paigaldama paketi perl-Hal-Cdroms, "
 "kui soovite, et seda tehakse automaatselt)"
 
-#: ../urpm/cdrom.pm:68
+#: ../urpm/cdrom.pm:69
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "HAL-deemon (hald) ei tööta või ei ole valmis"
 
-#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:162 ../urpm/cdrom.pm:167
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "andmekandja \"%s\" ei ole kättesaadav"
 
-#: ../urpm/cdrom.pm:205
+#: ../urpm/cdrom.pm:206
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "RPM-faili [%s] lugemine andmekandjalt \"%s\" nurjus"
@@ -600,7 +600,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:497 ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:477
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "seadistustefaili [%s] kirjutamine nurjus"
@@ -730,94 +730,94 @@ msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
 msgid "unable to handle protocol: %s"
 msgstr "ei suuda käsitleda protokolli: %s"
 
-#: ../urpm/get_pkgs.pm:15
+#: ../urpm/get_pkgs.pm:16
 #, c-format
 msgid "cleaning %s and %s"
 msgstr "puhastatakse %s ja %s"
 
-#: ../urpm/get_pkgs.pm:127
+#: ../urpm/get_pkgs.pm:128
 #, c-format
 msgid "package %s is not found."
 msgstr "paketti %s ei leitud."
 
-#: ../urpm/get_pkgs.pm:213
+#: ../urpm/get_pkgs.pm:227
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM-failide tõmbamine andmekandjalt \"%s\"..."
 
-#: ../urpm/install.pm:86
+#: ../urpm/install.pm:87
 #, c-format
 msgid "[repackaging]"
 msgstr "[taaspakendamine]"
 
-#: ../urpm/install.pm:167
+#: ../urpm/install.pm:168
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "tehing %s paigaldamiseks loodud (eemaldus=%d, paigaldus=%d, uuendus=%d)"
 
-#: ../urpm/install.pm:170
+#: ../urpm/install.pm:171
 #, c-format
 msgid "unable to create transaction"
 msgstr "tehingu loomine nurjus"
 
-#: ../urpm/install.pm:193
+#: ../urpm/install.pm:196
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "RPM-i ekstraktimine delta-rpm-paketist %s nurjus"
 
-#: ../urpm/install.pm:206
+#: ../urpm/install.pm:209
 #, c-format
 msgid "unable to install package %s"
 msgstr "paketi %s paigaldamine nurjus"
 
-#: ../urpm/install.pm:209
+#: ../urpm/install.pm:212
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "vigase RPM-faili (%s) eemaldamine %s-st"
 
-#: ../urpm/install.pm:210 ../urpm/install.pm:267
+#: ../urpm/install.pm:213 ../urpm/install.pm:277
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "%s eemaldamine nurjus: %s"
 
-#: ../urpm/install.pm:248
+#: ../urpm/install.pm:258
 #, c-format
 msgid "Removing package %s"
 msgstr "Paketi %s eemaldamine"
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:259
 #, c-format
 msgid "removing package %s"
 msgstr "paketi %s eemaldamine"
 
-#: ../urpm/install.pm:265
+#: ../urpm/install.pm:275
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "paigaldatud RPM-failide (%s) eemaldamine %s-st"
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:283
 #, c-format
 msgid "More information on package %s"
 msgstr "Rohkem infot paketi %s kohta"
 
-#: ../urpm/ldap.pm:71
+#: ../urpm/ldap.pm:70
 #, c-format
 msgid "Cannot create ldap cache directory"
 msgstr "LDAP puhvri kataloogi loomine nurjus"
 
-#: ../urpm/ldap.pm:73
+#: ../urpm/ldap.pm:72
 #, c-format
 msgid "Cannot write cache file for ldap\n"
 msgstr "LDAP-i puhvrifaili kirjutamine nurjus\n"
 
-#: ../urpm/ldap.pm:162
+#: ../urpm/ldap.pm:161
 #, c-format
 msgid "No server defined, missing uri or host"
 msgstr "Serverit pole määratud, URI või masin puudub"
 
-#: ../urpm/ldap.pm:163
+#: ../urpm/ldap.pm:162
 #, c-format
 msgid "No base defined"
 msgstr "Baas pole määratud"
@@ -827,17 +827,17 @@ msgstr "Baas pole määratud"
 msgid "Cannot connect to ldap uri:"
 msgstr "Ühendus LDAP URI-ga nurjus:"
 
-#: ../urpm/lock.pm:62
+#: ../urpm/lock.pm:63
 #, c-format
 msgid "%s database is locked. Waiting..."
 msgstr "%s andmebaas on lukus, oodatakse..."
 
-#: ../urpm/lock.pm:63
+#: ../urpm/lock.pm:64
 #, c-format
 msgid "aborting"
 msgstr "loobutakse"
 
-#: ../urpm/lock.pm:65
+#: ../urpm/lock.pm:66
 #, c-format
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s andmebaas on lukus (seda kasutab teine programm)"
@@ -847,18 +847,24 @@ msgstr "%s andmebaas on lukus (seda kasutab teine programm)"
 msgid "Retry?"
 msgstr "Kas proovida uuesti?"
 
-#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
-#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
-#, c-format
-msgid "Installation failed"
-msgstr "Paigaldamine nurjus"
+#: ../urpm/main_loop.pm:119
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s"
+msgstr ""
+"Paigaldamine nurjus, vigased RPM-failid:\n"
+"%s"
 
-#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
-#, c-format
-msgid "Try to go on anyway?"
-msgstr "Kas proovida siiski jätkata?"
+#: ../urpm/main_loop.pm:121
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr ""
+"Paigaldamine nurjus, mõned failid on puudu:\n"
+"%s\n"
+"Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../urpm/main_loop.pm:130
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -867,107 +873,118 @@ msgstr ""
 "Paigaldamine nurjus, vigased RPM-failid:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:148
+#: ../urpm/main_loop.pm:132 ../urpm/main_loop.pm:171 ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:259
+#, c-format
+msgid "Installation failed"
+msgstr "Paigaldamine nurjus"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "Try to go on anyway?"
+msgstr "Kas proovida siiski jätkata?"
+
+#: ../urpm/main_loop.pm:156
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Järgmisel paketil on vigane signatuur"
 
-#: ../urpm/main_loop.pm:149
+#: ../urpm/main_loop.pm:157
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Järgmistel pakettidel on vigane signatuur"
 
-#: ../urpm/main_loop.pm:150
+#: ../urpm/main_loop.pm:158
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Kas jätkata paigaldusega?"
 
-#: ../urpm/main_loop.pm:167
+#: ../urpm/main_loop.pm:175
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "paigaldatud RPM-failide (%s) eemaldamine"
 
-#: ../urpm/main_loop.pm:187
+#: ../urpm/main_loop.pm:195
 #, c-format
 msgid "distributing %s"
 msgstr "%s jaotamine"
 
-#: ../urpm/main_loop.pm:202
+#: ../urpm/main_loop.pm:210
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s paigaldamine andmekandjalt %s"
 
-#: ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:212
 #, c-format
 msgid "installing %s"
 msgstr "%s paigaldamine"
 
-#: ../urpm/main_loop.pm:242
+#: ../urpm/main_loop.pm:253
 #, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata?"
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:260
 #, c-format
 msgid "Try harder to install (--force)?"
 msgstr "Kas proovida paigaldust veel jõulisemalt (--force)?"
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:300
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pole ühtegi paketti uuendada"
 
-#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:311 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "Paigaldamine on võimalik"
 
-#: ../urpm/md5sum.pm:26
+#: ../urpm/md5sum.pm:27
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "hoiatus: MD5SUM failis puudub %s MD5 kontrollsumma"
 
-#: ../urpm/media.pm:204
+#: ../urpm/media.pm:194
 #, 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:206
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ligipääs \"%s\" nimekirjafailile nurjus, andmekandjat eiratakse"
 
-#: ../urpm/media.pm:213
+#: ../urpm/media.pm:199
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "ligipääs \"%s\" sünteesifailile nurjus, andmekandjat eiratakse"
 
-#: ../urpm/media.pm:240
+#: ../urpm/media.pm:225
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "püütakse vältida olemasolevat andmekandjat \"%s\""
 
-#: ../urpm/media.pm:456
+#: ../urpm/media.pm:441
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr "eemaldatava seadme migreerimine nurjus, andmekandjat eiratakse"
 
-#: ../urpm/media.pm:499 ../urpm/media.pm:505
+#: ../urpm/media.pm:479
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "seadistustefaili [%s] kirjutamine"
 
-#: ../urpm/media.pm:548
+#: ../urpm/media.pm:521
 #, 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:556
+#: ../urpm/media.pm:529
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "seostatava andmekandja kasutamine paralleelrežiimis: %s"
 
-#: ../urpm/media.pm:572
+#: ../urpm/media.pm:545
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -976,218 +993,213 @@ msgstr ""
 "võtit --synthesis ei saa kasutada võtmega --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib või --parallel"
 
-#: ../urpm/media.pm:666
-#, c-format
-msgid "Search start: %s end: %s"
-msgstr "Otsingu algus: %s lõpp: %s"
-
-#: ../urpm/media.pm:683
+#: ../urpm/media.pm:663
 #, c-format
 msgid "skipping package %s"
 msgstr "pakett %s jäetakse vahele"
 
-#: ../urpm/media.pm:699
+#: ../urpm/media.pm:679
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paketti %s ei uuendata, seda saab ainult paigaldada"
 
-#: ../urpm/media.pm:724
+#: ../urpm/media.pm:704
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "andmekandja \"%s\" on juba olemas"
 
-#: ../urpm/media.pm:763
+#: ../urpm/media.pm:743
 #, c-format
 msgid "(ignored by default)"
 msgstr "(vaikimisi eiratakse)"
 
-#: ../urpm/media.pm:769
+#: ../urpm/media.pm:749
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine enne võrguandmekandjat \"%s\""
 
-#: ../urpm/media.pm:775
+#: ../urpm/media.pm:755
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:784
 #, c-format
 msgid "directory %s does not exist"
 msgstr "kataloogi %s ei ole olemas"
 
-#: ../urpm/media.pm:812
+#: ../urpm/media.pm:792
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "see asukoht ei paista sisaldavat ühtegi distributsiooni"
 
-#: ../urpm/media.pm:828
+#: ../urpm/media.pm:808
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "faili media.cfg parsimine nurjus"
 
-#: ../urpm/media.pm:831
+#: ../urpm/media.pm:811
 #, 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:849
+#: ../urpm/media.pm:829
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "jäetakse vahele mitteühilduv andmekandja '%s' (%s)"
 
-#: ../urpm/media.pm:900
+#: ../urpm/media.pm:880
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "faili media.cfg tõmbamine..."
 
-#: ../urpm/media.pm:941
+#: ../urpm/media.pm:921
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "püüti valida olematut andmekandjat \"%s\""
 
-#: ../urpm/media.pm:944
+#: ../urpm/media.pm:924
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "mitme andmekandja valik: %s"
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:944
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "andmekandja \"%s\" eemaldamine"
 
-#: ../urpm/media.pm:1047
+#: ../urpm/media.pm:1027
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "urpmi ümberseadistamine andmekandja \"%s\" tarbeks"
 
-#: ../urpm/media.pm:1081
+#: ../urpm/media.pm:1061
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ümberseadistamine nurjus"
 
-#: ../urpm/media.pm:1087
+#: ../urpm/media.pm:1067
 #, c-format
 msgid "reconfiguration done"
 msgstr "ümberseadistamine tehtud"
 
-#: ../urpm/media.pm:1103
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Viga nimedefaili loomisel: sõltuvust %d ei leitud"
 
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1104
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "andmekandja \"%s\" on täiesti värske"
 
-#: ../urpm/media.pm:1135
+#: ../urpm/media.pm:1115
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sünteesifaili [%s] uurimine"
 
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
 
-#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1148 ../urpm/media.pm:1243
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopeeritakse [%s] andmekandjale \"%s\"..."
 
-#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
+#: ../urpm/media.pm:1150 ../urpm/media.pm:1220 ../urpm/media.pm:1473
 #, c-format
 msgid "...copying failed"
 msgstr "...kopeerimine nurjus"
 
-#: ../urpm/media.pm:1236
+#: ../urpm/media.pm:1216
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" kirjelduste faili kopeerimine..."
 
-#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1247
 #, c-format
 msgid "...copying done"
 msgstr "...kopeerimine tehtud"
 
-#: ../urpm/media.pm:1269
+#: ../urpm/media.pm:1249
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopeerimine nurjus (fail on kahtlaselt väike)"
 
-#: ../urpm/media.pm:1317
+#: ../urpm/media.pm:1297
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "tõmmatud allika sünteesifaili MD5SUM arvutamine"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
+#: ../urpm/media.pm:1299 ../urpm/media.pm:1736
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] tõmbamine nurjus (MD5SUM ei klapi)"
 
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1314
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 nurjus %s puhul"
 
-#: ../urpm/media.pm:1344
+#: ../urpm/media.pm:1324
 #, c-format
 msgid "comparing %s and %s"
 msgstr "%s ja %s võrdlemine"
 
-#: ../urpm/media.pm:1374
+#: ../urpm/media.pm:1354
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "vigane hdlist-fail %s andmekandjale \"%s\""
 
-#: ../urpm/media.pm:1400
+#: ../urpm/media.pm:1380
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" MD5SUM-faili kopeerimine..."
 
-#: ../urpm/media.pm:1440
+#: ../urpm/media.pm:1420
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "vigane MD5SUM-fail (alla laaditud asukohast %s)"
 
-#: ../urpm/media.pm:1443
+#: ../urpm/media.pm:1423
 #, c-format
 msgid "no metadata found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud metaandmeid"
 
-#: ../urpm/media.pm:1475
+#: ../urpm/media.pm:1455
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" allika sünteesifaili tõmbamine..."
 
-#: ../urpm/media.pm:1541
+#: ../urpm/media.pm:1521
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" avaliku võtme faili uurimine..."
 
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1533
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
 
-#: ../urpm/media.pm:1557
+#: ../urpm/media.pm:1537
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" avaliku võtme faili import nurjus"
 
-#: ../urpm/media.pm:1598
+#: ../urpm/media.pm:1578
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpm/media.pm:1631
+#: ../urpm/media.pm:1611
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uuendati andmekandjat \"%s\""
 
-#: ../urpm/media.pm:1752
+#: ../urpm/media.pm:1730
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] tõmbamine nurjus"
@@ -1212,19 +1224,19 @@ msgstr "leiti geolokatsioon %s %.2f %.2f ajavööndist %s"
 msgid "getting mirror list from %s"
 msgstr "%s peeglite nimekirja lugemine"
 
-#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
+#: ../urpm/msg.pm:76 ../urpmi:494 ../urpmi:509 ../urpmi:613
 #, c-format
 msgid "Nn"
 msgstr "EeNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
-#: ../urpmi.addmedia:141
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:545 ../urpmi:649 ../urpmi:655
+#: ../urpmi.addmedia:132
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:135
 #, c-format
 msgid " (y/N) "
 msgstr " (j/E) "
@@ -1294,14 +1306,19 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:311
+#: ../urpm/orphans.pm:51
 #, c-format
+msgid "Marking %s as manually installed, it won't be auto-orphaned"
+msgstr ""
+
+#: ../urpm/orphans.pm:362
+#, fuzzy, c-format
 msgid ""
-"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
-"it."
+"The following package is now orphan, if you wish to remove it, you can use "
+"\"urpme --auto-orphans\"."
 msgid_plural ""
-"The following packages are now orphans, use \"urpme --auto-orphans\" to "
-"remove them."
+"The following packages are now orphans, if you wish to remove them, you can "
+"use \"urpme --auto-orphans\"."
 msgstr[0] ""
 "Järgmine pakett on nüüd orb, kasutage eemaldamiseks  \"urpme --auto-orphans"
 "\"."
@@ -1309,32 +1326,32 @@ msgstr[1] ""
 "Järgmised paketid on nüüd orvud, kasutage eemaldamiseks  \"urpme --auto-"
 "orphans\"."
 
-#: ../urpm/parallel.pm:14
+#: ../urpm/parallel.pm:15
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "\"%s\" parsimine failis [%s] nurjus"
 
-#: ../urpm/parallel.pm:23
+#: ../urpm/parallel.pm:24
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "paralleelkäitleja uurimine failis [%s]"
 
-#: ../urpm/parallel.pm:34
+#: ../urpm/parallel.pm:35
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "leiti paralleelkäitleja sõlmedele: %s"
 
-#: ../urpm/parallel.pm:38
+#: ../urpm/parallel.pm:39
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "paralleelvõtme \"%s\" kasutamine nurjus"
 
-#: ../urpm/parallel.pm:93
+#: ../urpm/parallel.pm:94
 #, c-format
 msgid "on node %s"
 msgstr "sõlmes %s"
 
-#: ../urpm/parallel.pm:293
+#: ../urpm/parallel.pm:294
 #, c-format
 msgid "Installation failed on node %s"
 msgstr "Paigaldamine nurjus sõlmes %s"
@@ -1368,28 +1385,28 @@ msgstr ""
 "%s nurjus masinas %s (võib-olla ei ole urpmi korraliku versiooniga?) "
 "(väljumiskood: %d)"
 
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:33
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "ligipääs andmekandjale \"%s\" nurjus."
 
-#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
 #, c-format
 msgid "mounting %s"
 msgstr "%s haakimine"
 
-#: ../urpm/removable.pm:103
+#: ../urpm/removable.pm:104
 #, c-format
 msgid "unmounting %s"
 msgstr "%s lahutamine"
 
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:31
 #, 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:32
+#: ../urpm/select.pm:33
 #, c-format
 msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
@@ -1397,62 +1414,62 @@ msgstr ""
 "urpmi käivitati uuesti ja muudeti prioriteetsete pakettide nimekirja: %s "
 "varasema %s asemel"
 
-#: ../urpm/select.pm:170
+#: ../urpm/select.pm:176
 #, c-format
 msgid "No package named %s"
 msgstr "Paketti nimega %s ei ole"
 
-#: ../urpm/select.pm:172 ../urpme:117
+#: ../urpm/select.pm:178 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s sisaldub järgmistes pakettides: %s"
 
-#: ../urpm/select.pm:174
+#: ../urpm/select.pm:180
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr "Kõigi nende kasutamiseks tuleks anda \"-a\""
 
-#: ../urpm/select.pm:294
+#: ../urpm/select.pm:298
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Urpmi andmebaasis leiti paketid %s, aga need ei ole paigaldatud"
 
-#: ../urpm/select.pm:537
+#: ../urpm/select.pm:545
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakett %s on juba paigaldatud"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:546
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketid %s on juba paigaldatud"
 
-#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#: ../urpm/select.pm:564 ../urpm/select.pm:648
 #, c-format
 msgid "due to missing %s"
 msgstr "puuduva %s tõttu"
 
-#: ../urpm/select.pm:557
+#: ../urpm/select.pm:565
 #, c-format
 msgid "due to already installed %s"
 msgstr "juba paigaldatud %s tõttu"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#: ../urpm/select.pm:566 ../urpm/select.pm:646
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "rahuldamata %s tõttu"
 
-#: ../urpm/select.pm:564
+#: ../urpm/select.pm:572
 #, c-format
 msgid "trying to promote %s"
 msgstr "püüdes välja pakkuda %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:573
 #, c-format
 msgid "in order to keep %s"
 msgstr "säilitamaks %s"
 
-#: ../urpm/select.pm:606
+#: ../urpm/select.pm:614
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1461,7 +1478,7 @@ msgstr ""
 "Teiste uuendamiseks tuleb eemaldada järgmine pakett:\n"
 "%s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:615
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1470,27 +1487,27 @@ msgstr ""
 "Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
 "%s"
 
-#: ../urpm/select.pm:634
+#: ../urpm/select.pm:642
 #, c-format
 msgid "in order to install %s"
 msgstr "paigaldamaks %s"
 
-#: ../urpm/select.pm:644
+#: ../urpm/select.pm:652
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "konflikti tõttu %s-ga"
 
-#: ../urpm/signature.pm:32
+#: ../urpm/signature.pm:33
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Vigane signatuur (%s)"
 
-#: ../urpm/signature.pm:63
+#: ../urpm/signature.pm:64
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Vigane võtme ID (%s)"
 
-#: ../urpm/signature.pm:65
+#: ../urpm/signature.pm:66
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Puudub signatuur (%s)"
@@ -1572,7 +1589,7 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
 
 #: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
@@ -2329,42 +2346,42 @@ msgstr ""
 "Kasutage operatsiooni pealesundimiseks võtit --allow-force."
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:423
+#: ../urpmi:428
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uuendus)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:425
+#: ../urpmi:430
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uuendus)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:429
+#: ../urpmi:434
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (paigaldus)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:431
+#: ../urpmi:436
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (paigaldus)"
 
-#: ../urpmi:437
+#: ../urpmi:442
 #, 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:440
+#: ../urpmi:445
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Millise valite? (1-%d) "
 
-#: ../urpmi:482
+#: ../urpmi:487
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2375,7 +2392,7 @@ msgstr ""
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:484
+#: ../urpmi:489
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2386,7 +2403,7 @@ msgstr ""
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:490 ../urpmi:505
+#: ../urpmi:495 ../urpmi:510
 #, c-format
 msgid ""
 "\n"
@@ -2395,12 +2412,12 @@ msgstr ""
 "\n"
 "Kas siiski paigaldamist jätkata?"
 
-#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
+#: ../urpmi:496 ../urpmi:511 ../urpmi:614 ../urpmi.addmedia:135
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
 
-#: ../urpmi:499
+#: ../urpmi:504
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2409,7 +2426,7 @@ msgstr ""
 "Soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:505
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2418,12 +2435,12 @@ msgstr ""
 "Mõnda soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:517
+#: ../urpmi:522
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketi %s eemaldamine halvab Teie süsteemi"
 
-#: ../urpmi:525
+#: ../urpmi:530
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2434,7 +2451,7 @@ msgstr ""
 "järgmine pakett:\n"
 "%s\n"
 
-#: ../urpmi:527
+#: ../urpmi:532
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2445,12 +2462,12 @@ msgstr ""
 "järgmised paketid:\n"
 "%s\n"
 
-#: ../urpmi:535
+#: ../urpmi:540
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei eemaldata)"
 
-#: ../urpmi:555
+#: ../urpmi:560
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2461,46 +2478,46 @@ msgstr ""
 "buildrequires:\n"
 "%s\n"
 
-#: ../urpmi:566
+#: ../urpmi:571
 #, 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:582
+#: ../urpmi:596
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei paigaldata)"
 
-#: ../urpmi:588
+#: ../urpmi:602
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Kasutusele võetakse veel %s kettaruumi."
 
-#: ../urpmi:589
+#: ../urpmi:603
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Vabaneb %s kettaruumi."
 
-#: ../urpmi:590
+#: ../urpmi:604
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Tõmmatakse %s andmeid."
 
-#: ../urpmi:591
+#: ../urpmi:605
 #, 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:612
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../urpmi:620
+#: ../urpmi:634
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Vajutage Enter, kui see on tehtud..."
@@ -2630,83 +2647,74 @@ msgstr ""
 
 #: ../urpmi.addmedia:77
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - kasutab määratud URL-i peeglite loendi jaoks, vaikimisi\n"
-"                   on see %s\n"
-
-#: ../urpmi.addmedia:79
-#, 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:80 ../urpmi.update:44
+#: ../urpmi.addmedia:78 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - lisatud andmekandja avalikku võtit ei impordita\n"
 
-#: ../urpmi.addmedia:82
+#: ../urpmi.addmedia:80
 #, 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:83 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - vaikne režiim.\n"
 
-#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - selgitav režiim.\n"
 
-#: ../urpmi.addmedia:104
+#: ../urpmi.addmedia:95
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "saadaolevad XML-info reeglid on %s"
 
-#: ../urpmi.addmedia:115
+#: ../urpmi.addmedia:106
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "--distrib --mirrorlist <url> ei vaja mingeid argumente"
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:111
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "vigane <url> (kohaliku kataloogi asukoht peab olema absoluutne)"
 
-#: ../urpmi.addmedia:124
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Andmekandjaid võib lisada ainult administraator"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "creating config file [%s]"
 msgstr "luuakse seadistustefail [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:119
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Seadistustefaili [%s] loomine nurjus"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:127
 #, 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:144
+#: ../urpmi.addmedia:135
 #, c-format
 msgid ""
 "\n"
@@ -2715,164 +2723,20 @@ msgstr ""
 "\n"
 "Kas soovite lisada andmekandja '%s'?"
 
-#: ../urpmi.addmedia:170
-#, c-format
-msgid "<relative path of synthesis> missing\n"
-msgstr "Puudub <suhteline tee sünteesifaili juurde>\n"
-
-#: ../urpmi.addmedia:173
-#, c-format
-msgid "Can't use %s with remote medium"
-msgstr "%s kasutamine ei ole võimalik võrguandmekandjaga"
-
-#: ../urpmi.addmedia:185
+#: ../urpmi.addmedia:153 ../urpmi.addmedia:176
 #, c-format
 msgid "unable to add medium"
 msgstr "andmekandja lisamine nurjus"
 
-#: ../urpmi.recover:28
-#, c-format
-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"
-
-#: ../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
+#: ../urpmi.addmedia:161
 #, 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"
+msgid "<relative path of synthesis> missing\n"
+msgstr "Puudub <suhteline tee sünteesifaili juurde>\n"
 
-#: ../urpmi.recover:195
+#: ../urpmi.addmedia:164
 #, c-format
-msgid "Disabling repackaging\n"
-msgstr "Taaspakendamise keelamine\n"
+msgid "Can't use %s with remote medium"
+msgstr "%s kasutamine ei ole võimalik võrguandmekandjaga"
 
 #: ../urpmi.removemedia:38
 #, c-format
@@ -2968,12 +2832,12 @@ msgstr "  -f             - sunnib jõuga uuendama sünteestifaile.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Andmekandjaid võib uuendada ainult administraator"
 
-#: ../urpmi.update:82
+#: ../urpmi.update:86
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi.update:91
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2982,17 +2846,17 @@ msgstr ""
 "puudub uuendatava kirje nimi\n"
 "(võimalikud: %s)\n"
 
-#: ../urpmi.update:106
+#: ../urpmi.update:98
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "ignoring media %s"
 msgstr "andmekandja %s ignoreerimine"
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "enabling media %s"
 msgstr "andmekandja %s arvestamine"
@@ -3270,11 +3134,121 @@ msgid ""
 msgstr ""
 "andmekandjal \"%s\" puudub XML-info, pakettidele %s ei ole mingit tulemust"
 
-#: ../urpmq:473
+#: ../urpmq:476
 #, c-format
 msgid "No changelog found\n"
 msgstr "Muutuste logi ei leitud\n"
 
+#~ msgid "Search start: %s end: %s"
+#~ msgstr "Otsingu algus: %s lõpp: %s"
+
+#~ msgid ""
+#~ "  --from         - use specified url for list of mirrors, the default is\n"
+#~ "                   %s\n"
+#~ msgstr ""
+#~ "  --from         - kasutab määratud URL-i peeglite loendi jaoks, "
+#~ "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"