Synced translations with template

1 files changed, 503 insertions, 496 deletions

diff --git a/po/et.po b/po/et.po
index 9538020b..202a7d7c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\n"
 "PO-Revision-Date: 2008-08-30 12:48+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-i paigaldamine"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Viga: faili %s ei leitud, toiming katkestatakse"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "_Olgu"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 "Mida nüüd ette võtta?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -68,7 +68,7 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -83,22 +83,22 @@ msgstr ""
 "\n"
 "Võib-olla soovite siiski seda lihtsalt salvestada? Mida ette võtta?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "_Paigalda"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "_Loobu"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "Valige faili salvestamise koht"
@@ -206,12 +206,12 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Pakette pole valitud"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "Palun oodake..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "Vajalikud on administraatori õigused"
@@ -242,42 +242,42 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr " (uuendus)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr " (paigaldus)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "Paketivalik"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "_Katkesta"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -288,56 +288,63 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakett, %d MB)"
 msgstr[1] "(%d paketti, %d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "pakette ei õnnestunud hankida, katkestatakse"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Palun sisestage andmekandja nimega \"%s\""
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Paketi '%s' allalaadimine..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...tõmbamine nurjus: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "_Tehtud"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -348,28 +355,27 @@ msgstr ""
 "%s\n"
 "Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "Paigaldamine nurjus:"
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Kõik on juba paigaldatud"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "Paigaldus lõpetatud"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s eemaldamine"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
@@ -444,58 +450,52 @@ msgstr "Keskkonna kataloogi %s ei ole olemas"
 msgid "using specific environment on %s\n"
 msgstr "spetsiifilise keskkonna kasutamine %s puhul\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb avamine nurjus"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "vigane RPM-faili nimi [%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-faili [%s] tõmbamine..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
 
-#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...tõmbamine nurjus: %s"
-
-#: ../urpm.pm:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ligipääs RPM-failile [%s] nurjus"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "spetsifikatsioonifaili %s parsimine nurjus [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-faili registreerimine nurjus"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Sobimatu arhitektuur RPM-ile [%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "viga kohalike pakettide registreerimisel"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "See operatsioon on piiratud režiimis keelatud"
@@ -536,22 +536,22 @@ msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "vaikimisi ootab urpmf regulaaravaldist, peaksite kasutama võtit \"--literal\""
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kataloogi ei ole olemas"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s kasutamine ei ole võimalik %s-ga"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
@@ -645,82 +645,87 @@ msgstr "%s nurjus: lõpetas signaaliga %d"
 msgid "%s failed: exited with %d"
 msgstr "%s nurjus: lõpetas %d-ga"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "kopeerimine nurjus"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget puudub\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl puudub\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl nurjus: allalaadimine katkestati\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync puudub\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh puudub\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla puudub\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Prozilla käivitamine nurjus\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 puudub\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% %s-st valmis, aega jäänud: %s, kiirus: %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% valmis, kiirus: %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "%s tõmbamine"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "tõmmati %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "tundmatu protokoll %s jaoks"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ei suuda käsitleda protokolli: %s"
@@ -740,59 +745,59 @@ msgstr "paketti %s ei leitud."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM-failide tõmbamine andmekandjalt \"%s\"..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[taaspakendamine]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "tehing %s paigaldamiseks loodud (eemaldus=%d, paigaldus=%d, uuendus=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "tehingu loomine nurjus"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "RPM-i ekstraktimine delta-rpm-paketist %s nurjus"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "paketi %s paigaldamine nurjus"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "vigase RPM-faili (%s) eemaldamine %s-st"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "%s eemaldamine nurjus: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "Paketi %s eemaldamine"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "paketi %s eemaldamine"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "paigaldatud RPM-failide (%s) eemaldamine %s-st"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "Rohkem infot paketi %s kohta"
@@ -837,18 +842,23 @@ msgstr "loobutakse"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s andmebaas on lukus (seda kasutab teine programm)"
 
-#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Paigaldamine nurjus"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "Kas proovida siiski jätkata? (j/E)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -857,57 +867,57 @@ msgstr ""
 "Paigaldamine nurjus, vigased RPM-failid:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Järgmisel paketil on vigane signatuur"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Järgmistel pakettidel on vigane signatuur"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Kas jätkata paigaldusega?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "paigaldatud RPM-failide (%s) eemaldamine"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "%s jaotamine"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s paigaldamine andmekandjalt %s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "%s paigaldamine"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pole ühtegi paketti uuendada"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Paigaldamine on võimalik"
@@ -1112,7 +1122,7 @@ msgstr "[%s] kopeerimine nurjus (fail on kahtlaselt väike)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "tõmmatud allika sünteesifaili MD5SUM arvutamine"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] tõmbamine nurjus (MD5SUM ei klapi)"
@@ -1152,32 +1162,32 @@ msgstr "andmekandjale \"%s\" ei leitud metaandmeid"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" allika sünteesifaili tõmbamine..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" avaliku võtme faili uurimine..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" avaliku võtme faili import nurjus"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uuendati andmekandjat \"%s\""
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] tõmbamine nurjus"
@@ -1192,94 +1202,99 @@ msgstr "püütakse uuesti peegliga %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Peeglite nimekirjas %s ei leitud peeglit"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "leiti geolokatsioon %s %.2f %.2f ajavööndist %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "%s peeglite nimekirja lugemine"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, c-format
 msgid "Nn"
 msgstr "EeNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/E) "
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "Pakett"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "Versioon"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "Väljalase"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "Arhit."
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(pakkumine)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "andmekandja \"%s\""
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "käsurida"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1368,307 +1383,6 @@ msgstr "%s haakimine"
 msgid "unmounting %s"
 msgstr "%s lahutamine"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [options] pattern-expression\n"
-msgstr ""
-"urpmf versioon %s\n"
-"Autoriõigus (C) 2002-2006 Mandriva.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine: urpmf [võtmed] pattern-expression\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - näitab programmi versiooni.\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
-"                   vearaportideks).\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia        - ei kasutata määratud andmekandjaid (eraldajaks "
-"koma).\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - mustrina tõlgendamise asemel kasutatakse argumenti "
-"täpselt esitatud kujul.\n"
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - muu baasi kasutamine urpmi andmebaasi jaoks ja RPM-ide "
-"paigaldamisel.\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
-"koma).\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --use-distrib  - andmekandja kasutamiseks kasutatakse määratud asukohta.\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - selgitav režiim.\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - tõstutundetu igas olukorras.\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - tõstu arvestamine mustrites (vaikimisi).\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - väljade eraldaja muutmine (vaikimisi ':').\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Mustriavaldised:\n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - suvalist teksti parsitakse regulaaravaldisena, kui ei "
-"kasutata võtit -l.\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binaaroperaator AND.\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binaaroperaator OR.\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unaaroperaator NOT.\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - parem- ja vasakpoolne sulg.\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Siltide nimekiri:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - printf laadis vormindatud väljund\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   näide: '%%name:%%files'\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arhitektuur\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - valmistajamasin\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - valmistamisaeg\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - konfiguratsioonifailid\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - konfliktide sildid\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - paketi kirjeldus\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distributsioon\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epohh\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - paketi failinimi\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - paketi failide nimekiri\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grupp\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - litsents\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - paketi nimi\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - iganenute sildid\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - paketi valmistaja\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - pakutavate sildid\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - nõutavate sildid\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - paigalduse suurus\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - lähtekoodi RPM-i nimi\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - pakkumiste sildid\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - kokkuvõte\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - tootja\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - paketti sisaldav andmekandja\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - näitab koos nimega versiooni, väljalaset ja "
-"arhitektuuri.\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Vigane vorming: kasutada tohib ainult üht mitme väärtusega silti"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "andmekandjale \"%s\" ei leitud hdlist-faili"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "andmekandjale \"%s\" ei leitud XML-infot"
-
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1688,7 +1402,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Paketti nimega %s ei ole"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s sisaldub järgmistes pakettides: %s"
@@ -1698,47 +1412,47 @@ msgstr "%s sisaldub järgmistes pakettides: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "Kõigi nende kasutamiseks tuleks anda \"-a\""
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Urpmi andmebaasis leiti paketid %s, aga need ei ole paigaldatud"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakett %s on juba paigaldatud"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketid %s on juba paigaldatud"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "puuduva %s tõttu"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "juba paigaldatud %s tõttu"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "rahuldamata %s tõttu"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "püüdes välja pakkuda %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "säilitamaks %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1747,7 +1461,7 @@ msgstr ""
 "Teiste uuendamiseks tuleb eemaldada järgmine pakett:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1756,12 +1470,12 @@ msgstr ""
 "Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "paigaldamaks %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "konflikti tõttu %s-ga"
@@ -1857,6 +1571,14 @@ msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - muu baasi kasutamine urpmi andmebaasi jaoks ja RPM-ide "
+"paigaldamisel.\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1888,39 +1610,39 @@ msgstr "  --verbose, -v  - selgitav režiim.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Tarkvara võib eemaldada ainult administraator"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "tundmatud paketid"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "tundmatu pakett"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Järgmise paketi eemaldamine halvab Teie süsteemi:"
 msgstr[1] "Järgmiste pakettide eemaldamine halvab Teie süsteemi:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "Pole midagi eemaldada"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "Pole ühtegi orbu eemaldada"
 
-#: ../urpme:149
+#: ../urpme:151
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1928,45 +1650,332 @@ msgid_plural ""
 msgstr[0] "Sõltuvuste lahendamiseks tuleb eemaldada järgmine pakett"
 msgstr[1] "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti"
 
-#: ../urpme:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(orvust pakett)"
 msgstr[1] "(orvust paketid)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Kas eemaldada %d pakett?"
 msgstr[1] "Kas eemaldada %d paketti?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr " (j/E) "
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "%s eemaldamise test"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "Eemaldamine nurjus"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 msgid "Removal is possible"
 msgstr "Eemaldamine on võimalik"
 
+#: ../urpmf:29
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage: urpmf [options] pattern-expression\n"
+msgstr ""
+"urpmf versioon %s\n"
+"Autoriõigus (C) 2002-2006 Mandriva.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine: urpmf [võtmed] pattern-expression\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - näitab programmi versiooni.\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
+"                   vearaportideks).\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia        - ei kasutata määratud andmekandjaid (eraldajaks "
+"koma).\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - mustrina tõlgendamise asemel kasutatakse argumenti "
+"täpselt esitatud kujul.\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
+"koma).\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --use-distrib  - andmekandja kasutamiseks kasutatakse määratud asukohta.\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - selgitav režiim.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - tõstutundetu igas olukorras.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - tõstu arvestamine mustrites (vaikimisi).\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - väljade eraldaja muutmine (vaikimisi ':').\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Mustriavaldised:\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  text           - suvalist teksti parsitakse regulaaravaldisena, kui ei "
+"kasutata võtit -l.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binaaroperaator AND.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binaaroperaator OR.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unaaroperaator NOT.\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - parem- ja vasakpoolne sulg.\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Siltide nimekiri:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - printf laadis vormindatud väljund\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   näide: '%%name:%%files'\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arhitektuur\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - valmistajamasin\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - valmistamisaeg\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - konfiguratsioonifailid\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - konfliktide sildid\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - paketi kirjeldus\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distributsioon\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epohh\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - paketi failinimi\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - paketi failide nimekiri\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grupp\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - litsents\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - paketi nimi\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - iganenute sildid\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - paketi valmistaja\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - pakutavate sildid\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - nõutavate sildid\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - paigalduse suurus\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - lähtekoodi RPM-i nimi\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - pakkumiste sildid\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - kokkuvõte\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - URL\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - tootja\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - paketti sisaldav andmekandja\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - näitab koos nimega versiooni, väljalaset ja "
+"arhitektuuri.\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "lõpetamata avaldis (%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Vigane vorming: kasutada tohib ainult üht mitme väärtusega silti"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "andmekandjale \"%s\" ei leitud hdlist-faili"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "andmekandjale \"%s\" ei leitud XML-infot"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2319,48 +2328,43 @@ msgstr ""
 "Viga: %s paistab olevat haagitud ainult loetavana.\n"
 "Kasutage operatsiooni pealesundimiseks võtit --allow-force."
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "Andmekandja uuendamine...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uuendus)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uuendus)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (paigaldus)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (paigaldus)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Sõltuvuse '%s' lahendamiseks on vajalik üks järgmistest pakettidest:"
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Millise valite? (1-%d) "
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2371,7 +2375,7 @@ msgstr ""
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2382,7 +2386,7 @@ msgstr ""
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2391,12 +2395,12 @@ msgstr ""
 "\n"
 "Kas siiski paigaldamist jätkata?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2405,7 +2409,7 @@ msgstr ""
 "Soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2414,12 +2418,12 @@ msgstr ""
 "Mõnda soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketi %s eemaldamine halvab Teie süsteemi"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2430,7 +2434,7 @@ msgstr ""
 "järgmine pakett:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2441,12 +2445,12 @@ msgstr ""
 "järgmised paketid:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei eemaldata)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2457,46 +2461,46 @@ msgstr ""
 "buildrequires:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Eemaldatakse järgmine orvust pakett."
 msgstr[1] "Eemaldatakse järgmised orvust paketid."
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei paigaldata)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Kasutusele võetakse veel %s kettaruumi."
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Vabaneb %s kettaruumi."
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Tõmmatakse %s andmeid."
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Kas paigaldada 1 pakett?"
 msgstr[1] "Kas paigaldada %d paketti?"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Vajutage Enter, kui see on tehtud..."
@@ -2964,12 +2968,12 @@ msgstr "  -f             - sunnib jõuga uuendama sünteestifaile.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Andmekandjaid võib uuendada ainult administraator"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2978,17 +2982,17 @@ msgstr ""
 "puudub uuendatava kirje nimi\n"
 "(võimalikud: %s)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "andmekandja %s ignoreerimine"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "andmekandja %s arvestamine"
@@ -3271,6 +3275,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Muutuste logi ei leitud\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "Andmekandja uuendamine...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "%s faili uurimine"