usync with code

1 files changed, 479 insertions, 463 deletions

diff --git a/po/et.po b/po/et.po
index cb7e4e72..c6d6f9e3 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-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-07-28 12:45+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-i paigaldamine"
@@ -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:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Olgu"
@@ -93,7 +93,7 @@ msgstr "_Paigalda"
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Loobu"
@@ -125,8 +125,9 @@ msgstr ""
 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
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - näitab seda abiteadet.\n"
@@ -163,7 +164,7 @@ msgstr ""
 "  --verify-rpm   - kontrollib RPM-i signatuuri enne paigaldust\n"
 "                   (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -216,7 +217,7 @@ msgstr "Palun oodake..."
 msgid "Must be root"
 msgstr "Vajalikud on administraatori õigused"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -227,42 +228,42 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (uuendus)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (paigaldus)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Paketivalik"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Katkesta"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -273,61 +274,61 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, 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:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Paketi paigaldamine..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "pakette ei õnnestunud hankida, katkestatakse"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Palun sisestage andmekandja nimega \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Paketi '%s' allalaadimine..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Tehtud"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -338,28 +339,28 @@ msgstr ""
 "%s\n"
 "Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Paigaldamine nurjus:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Kõik on juba paigaldatud"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Paigaldus lõpetatud"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s eemaldamine"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
@@ -440,8 +441,8 @@ msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...tõmbamine nurjus: %s"
@@ -481,53 +482,53 @@ msgstr "See operatsioon on piiratud režiimis keelatud"
 msgid "bad proxy declaration on command line\n"
 msgstr "käsureal on määratud vigane puhverserver\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faili \"%s\" lugemine nurjus\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "ootamatu avaldis %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "avaldis puudub %s ees"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, 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:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "pole ühtegi avaldist lõpetada"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, 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:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kataloogi ei ole olemas"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s kasutamine ei ole võimalik %s-ga"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
@@ -957,218 +958,218 @@ msgstr ""
 "võtit --synthesis ei saa kasutada võtmega --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib või --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Otsingu algus: %s lõpp: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "pakett %s jäetakse vahele"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paketti %s ei uuendata, seda saab ainult paigaldada"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "andmekandja \"%s\" on juba olemas"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(vaikimisi eiratakse)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine enne võrguandmekandjat \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "kataloogi %s ei ole olemas"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "see asukoht ei paista sisaldavat ühtegi distributsiooni"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "faili media.cfg parsimine nurjus"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, 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:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "jäetakse vahele mitteühilduv andmekandja '%s' (%s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "faili media.cfg tõmbamine..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "püüti valida olematut andmekandjat \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "mitme andmekandja valik: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "andmekandja \"%s\" eemaldamine"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "urpmi ümberseadistamine andmekandja \"%s\" tarbeks"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ümberseadistamine nurjus"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "ümberseadistamine tehtud"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Viga nimedefaili loomisel: sõltuvust %d ei leitud"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "andmekandja \"%s\" on täiesti värske"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sünteesifaili [%s] uurimine"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopeeritakse [%s] andmekandjale \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopeerimine nurjus"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" kirjelduste faili kopeerimine..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopeerimine tehtud"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopeerimine nurjus (fail on kahtlaselt väike)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "tõmmatud allika sünteesifaili MD5SUM arvutamine"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] tõmbamine nurjus (MD5SUM ei klapi)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 nurjus %s puhul"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "%s ja %s võrdlemine"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "vigane hdlist-fail %s andmekandjale \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" MD5SUM-faili kopeerimine..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "vigane MD5SUM-fail (alla laaditud asukohast %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" allika sünteesifaili tõmbamine..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "leiti kontrollitud sünteesifail %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" avaliku võtme faili uurimine..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" avaliku võtme faili import nurjus"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uuendati andmekandjat \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] tõmbamine nurjus"
@@ -1200,7 +1201,7 @@ msgstr "EeNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
@@ -1270,7 +1271,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1278,8 +1279,12 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "Järgmine pakett on nüüd orb, kasutage eemaldamiseks  \"urpme --auto-orphans\"."
-msgstr[1] "Järgmised paketid on nüüd orvud, kasutage eemaldamiseks  \"urpme --auto-orphans\"."
+msgstr[0] ""
+"Järgmine pakett on nüüd orb, kasutage eemaldamiseks  \"urpme --auto-orphans"
+"\"."
+msgstr[1] ""
+"Järgmised paketid on nüüd orvud, kasutage eemaldamiseks  \"urpme --auto-"
+"orphans\"."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1337,8 +1342,8 @@ msgid ""
 "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
 "code: %d)"
 msgstr ""
-"%s nurjus masinas %s (võib-olla ei ole urpmi korraliku versiooniga?) (väljumiskood: "
-"%d)"
+"%s nurjus masinas %s (võib-olla ei ole urpmi korraliku versiooniga?) "
+"(väljumiskood: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
@@ -1355,279 +1360,7 @@ msgstr "%s haakimine"
 msgid "unmounting %s"
 msgstr "%s lahutamine"
 
-#: ../urpm/select.pm:28
-#, 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:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"urpmi käivitati uuesti ja muudeti prioriteetsete pakettide nimekirja: %s %s "
-"asemel"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Paketti nimega %s ei ole"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s sisaldub järgmistes pakettides: %s"
-
-#: ../urpm/select.pm:296
-#, 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:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pakett %s on juba paigaldatud"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketid %s on juba paigaldatud"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "puuduva %s tõttu"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "juba paigaldatud %s tõttu"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "rahuldamata %s tõttu"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "püüdes välja pakkuda %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "säilitamaks %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "paigaldamaks %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "konflikti tõttu %s-ga"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Vigane signatuur (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Vigane võtme ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Puudub signatuur (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "süsteem"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "%s tuleks taaskäivitada, sest seda vajab %s"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Faili kirjutamine nurjus"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Faili avamine nurjus"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Faili %s liigutamine asukohta %s ei ole võimalik"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versioon %s\n"
-"Autoriõigus © 1999-2008 Mandriva.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - orbude eemaldamine\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
-"masina.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
-
-#: ../urpme:53
-#, c-format
-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:71
-#: ../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
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - seadistab urpme lennult distributsioonipuu põhjal,\n"
-"                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
-"root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - selgitav režiim.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Tarkvara võib eemaldada ainult administraator"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "tundmatud paketid"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "tundmatu pakett"
-
-#: ../urpme:119
-#, 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:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Pole midagi eemaldada"
-
-#: ../urpme:141
-#, c-format
-msgid "No orphans to remove"
-msgstr "Pole ühtegi orbu eemaldada"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Sõltuvuste lahendamiseks tuleb eemaldada järgmine pakett"
-msgstr[1] "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti"
-
-#: ../urpme:152
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "(orvust pakett)"
-msgstr[1] "(orvust paketid)"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Kas eemaldada %d pakett?"
-msgstr[1] "Kas eemaldada %d paketti?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (j/E) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr "%s eemaldamise test"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Eemaldamine nurjus"
-
-#: ../urpme:180
-#, c-format
-msgid "Removal is possible"
-msgstr "Eemaldamine on võimalik"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1644,26 +1377,26 @@ msgstr ""
 "\n"
 "kasutamine: urpmf [võtmed] pattern-expression\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - näitab programmi versiooni.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../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"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1671,7 +1404,16 @@ msgstr ""
 "  --literal, -l  - mustrina tõlgendamise asemel kasutatakse argumenti "
 "täpselt esitatud kujul.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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"
@@ -1679,256 +1421,531 @@ msgstr ""
 "  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --use-distrib  - andmekandja kasutamiseks kasutatakse määratud asukohta.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../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"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - selgitav režiim.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - tõstutundetu igas olukorras.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - tõstu arvestamine mustrites (vaikimisi).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - väljade eraldaja muutmine (vaikimisi ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mustriavaldised:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - suvalist teksti parsitakse regulaaravaldisena, kui ei "
 "kasutata võtit -l.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binaaroperaator AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binaaroperaator OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaaroperaator NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parem- ja vasakpoolne sulg.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Siltide nimekiri:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - printf laadis vormindatud väljund\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   näide: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arhitektuur\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - valmistajamasin\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - valmistamisaeg\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfiguratsioonifailid\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - konfliktide sildid\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - paketi kirjeldus\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distributsioon\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epohh\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketi failinimi\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketi failide nimekiri\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupp\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - litsents\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - paketi nimi\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - iganenute sildid\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - paketi valmistaja\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - pakutavate sildid\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - nõutavate sildid\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - paigalduse suurus\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - lähtekoodi RPM-i nimi\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - pakkumiste sildid\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - kokkuvõte\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - tootja\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paketti sisaldav andmekandja\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../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"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "lõpetamata avaldis (%s)"
-
-#: ../urpmf:198
+#: ../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"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "spetsiifilise keskkonna kasutamine %s puhul\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud hdlist-faili"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpmf:307
+#: ../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:28
+#, 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:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi käivitati uuesti ja muudeti prioriteetsete pakettide nimekirja: %s %s "
+"asemel"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Paketti nimega %s ei ole"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s sisaldub järgmistes pakettides: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, 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:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pakett %s on juba paigaldatud"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Paketid %s on juba paigaldatud"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "puuduva %s tõttu"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "juba paigaldatud %s tõttu"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "rahuldamata %s tõttu"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "püüdes välja pakkuda %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "säilitamaks %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "paigaldamaks %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "konflikti tõttu %s-ga"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Vigane signatuur (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Vigane võtme ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Puudub signatuur (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "süsteem"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "%s tuleks taaskäivitada, sest seda vajab %s"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Faili kirjutamine nurjus"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Faili avamine nurjus"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Faili %s liigutamine asukohta %s ei ole võimalik"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versioon %s\n"
+"Autoriõigus © 1999-2008 Mandriva.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - orbude eemaldamine\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
+"masina.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - uuendab ainult RPM-ide andmebaasi, mitte failisüsteemi.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - seadistab urpme lennult distributsioonipuu põhjal,\n"
+"                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
+"root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - selgitav režiim.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Tarkvara võib eemaldada ainult administraator"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "tundmatud paketid"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "tundmatu pakett"
+
+#: ../urpme:121
+#, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Järgmise paketi eemaldamine halvab Teie süsteemi:"
+msgstr[1] "Järgmiste pakettide eemaldamine halvab Teie süsteemi:"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Pole midagi eemaldada"
+
+#: ../urpme:143
+#, c-format
+msgid "No orphans to remove"
+msgstr "Pole ühtegi orbu eemaldada"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Sõltuvuste lahendamiseks tuleb eemaldada järgmine pakett"
+msgstr[1] "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti"
+
+#: ../urpme:154
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "(orvust pakett)"
+msgstr[1] "(orvust paketid)"
+
+#: ../urpme:161
+#, 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:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/E) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr "%s eemaldamise test"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Eemaldamine nurjus"
+
+#: ../urpme:183
+#, c-format
+msgid "Removal is possible"
+msgstr "Eemaldamine on võimalik"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "lõpetamata avaldis (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2020,12 +2037,6 @@ msgstr "  --clean        - eemaldab enne muud tegevust RPM-i puhvrist.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - säilitab puhvris mittekasutatud RPM-id.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - uuendab ainult RPM-ide andmebaasi, mitte failisüsteemi.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2359,7 +2370,7 @@ msgstr ""
 "\n"
 "Kas siiski paigaldamist jätkata?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
@@ -2553,10 +2564,12 @@ msgstr "  --aria2        - aria2 kasutamine kaugfailide tõmbamiseks.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - loob uuendatava andmekandja.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2568,22 +2581,22 @@ msgstr ""
 "                   reegel on üks järgmistest: never, on-demand, update-only, "
 "always. Vt urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - kasutatakse sünteesifaili.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - kasutatakse RPM-faile (sünteesifaili asemel).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - ei püüta kasutada sünteesifaili.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2591,21 +2604,21 @@ msgid ""
 msgstr ""
 "  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - koos võtmega --distrib küsib kinnitust iga andmekandja "
 "puhul\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media    - koos võtmega --distrib lisab kõik loetletud "
 "andmekandjad.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2614,76 +2627,76 @@ msgstr ""
 "  --from         - kasutab määratud URL-i peeglite loendi jaoks, vaikimisi\n"
 "                   on see %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../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:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - lisatud andmekandja avalikku võtit ei impordita\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, 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:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - vaikne režiim.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - selgitav režiim.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "saadaolevad XML-info reeglid on %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "--distrib --mirrorlist <url> ei vaja mingeid argumente"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "vigane <url> (kohaliku kataloogi asukoht peab olema absoluutne)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Andmekandjaid võib lisada ainult administraator"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "luuakse seadistustefail [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Seadistustefaili [%s] loomine nurjus"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, 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:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2692,17 +2705,17 @@ msgstr ""
 "\n"
 "Kas soovite lisada andmekandja '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "Puudub <suhteline tee sünteesifaili juurde>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "%s kasutamine ei ole võimalik võrguandmekandjaga"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "andmekandja lisamine nurjus"
@@ -2945,12 +2958,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:77
+#: ../urpmi.update:78
 #, 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:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2959,17 +2972,17 @@ msgstr ""
 "puudub uuendatava kirje nimi\n"
 "(võimalikud: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "andmekandja %s ignoreerimine"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "andmekandja %s arvestamine"
@@ -3252,6 +3265,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Muutuste logi ei leitud\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - loob uuendatava andmekandja.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "vigane URL: [%s]"