sync with code

1 files changed, 735 insertions, 457 deletions

diff --git a/po/et.po b/po/et.po
index f8678a52..a6630c61 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: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-12-04 01:04+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM-i paigaldamine"
 
@@ -25,7 +26,8 @@ msgstr "RPM-i paigaldamine"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Viga: faili %s ei leitud, toiming katkestatakse"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "_Olgu"
 
@@ -80,20 +82,23 @@ msgstr ""
 "\n"
 "Võib-olla soovite siiski seda lihtsalt salvestada? Mida ette võtta?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "_Paigalda"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "_Loobu"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "Valige faili salvestamise koht"
 
@@ -103,18 +108,21 @@ msgid "Unknown option %s"
 msgstr "Tundmatu võti %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "Pakette pole valitud"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "Palun oodake..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "Vajalikud on administraatori õigused"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -125,35 +133,42 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Olgu"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Olgu"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr " (uuendus)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr " (paigaldus)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "Paketivalik"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "_Katkesta"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -164,7 +179,7 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -174,25 +189,27 @@ msgstr ""
 "Sõltuvuste lahendamiseks paigaldatakse järgmised %d paketti:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "Paketi paigaldamine..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "pakette ei õnnestunud hankida, katkestatakse"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Paketi '%s' allalaadimine..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -205,8 +222,7 @@ msgstr ""
 "\n"
 "Kas jätkata paigaldamisega?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -217,35 +233,38 @@ msgstr ""
 "%s\n"
 "Te võiksite ehk uuendada urpmi andmebaasi"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "%s eemaldamine"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "_Tehtud"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "Kõik on juba paigaldatud"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "Paigaldus lõpetatud"
 
@@ -259,19 +278,23 @@ msgstr ""
 "kus [võtmed] on\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - näitab seda abiteadet.\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 "   --root <asukoht>  - asukoha / asemel kasutatakse määratud juurkataloogi.\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [grupp]     - piirab tulemused määratud grupiga.\n"
 
 #: ../rpm-find-leaves:19
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - näitab RPM-i täielikku nime (NVRA).\n"
 
@@ -280,209 +303,127 @@ msgstr "   -f             - näitab RPM-i täielikku nime (NVRA).\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    vaikimisi on %s.\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Pakette võib paigaldada ainult administraator"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "Urpmi käivitamine piiratud režiimis..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb avamine ebaõnnestus"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr "puhvris leiti %d RPM-päist, eemaldatakse %d iganenud päist"
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "vigane RPM-faili nimi [%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-faili [%s] tõmbamine..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...tõmbamine ebaõnnestus: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ligipääs RPM-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "spetsifikatsioonifaili %s parsimine ebaõnnestus [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-faili registreerimine ebaõnnestus"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Sobimatu arhitektuur RPM-ile [%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "viga kohalike pakettide registreerimisel"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "See operatsioon on piiratud režiimis keelatud"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "käsureal on määratud vigane puhverserver\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kataloogi ei ole olemas"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "Võtme --use-distrib kasutamiseks peate olema administraator"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faili \"%s\" lugemine ebaõnnestus\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, fuzzy, c-format
+msgid "Can't use %s with %s"
+msgstr "%s kasutamine on võimalik ainult koos %s-ga"
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "EeNn"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput ebaõnnestus, võib-olla pole sõlm kättesaadav"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "sõlmes %s on urpme vana versioon, palun uuendage"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp ebaõnnestus, võib-olla pole sõlm kättesaadav"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "sõlmes %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Sünteesifaili levitamine sõlmedes"
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Sõltuvuste lahendamine sõlmedes..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Failide jagamine sõlmedesse..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Paigaldamise võimalikkuse kontroll sõlmedes..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Paigaldamine ebaõnnestus sõlmes %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Paigaldamine on võimalik"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Pakettide paigaldamine sõlmedes..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "scp ebaõnnestus masinas %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Sünteesifaili levitamine masinasse %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Sõltuvuste lahendamine masinas %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "masinas %s puudub urpmi korralik versioon (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Failide jagamine masinasse %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Paigaldamise võimalikkuse kontroll masinas %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Paigaldamine masinas %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "%s paigaldamine masinas %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Paigaldamiseks valmistumine masinas %s..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -500,47 +441,62 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - näitab seda abiteadet.\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
 "olemas.\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../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:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - muu baasi kasutamine RPM-ide paigaldamisel.\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, 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"
@@ -549,74 +505,79 @@ msgstr ""
 "                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
 "root.\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "    --probe-synthesis - kasutatakse sünteesifaili.\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "    --probe-hdlist - kasutatakse hdlist-faili.\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - selgitav režiim.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - selgitav režiim.\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Tarkvara võib eemaldada ainult administraator"
 
 #: ../urpme:106
-msgid "unknown package"
-msgstr "tundmatu pakett"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
 msgid "unknown packages"
 msgstr "tundmatud paketid"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "tundmatu pakett"
+
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s sisaldub järgmistes pakettides: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketi %s eemaldamine halvab Teie süsteemi"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "Pole midagi eemaldada"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Kontrollitakse, kas on võimalik eemaldada järgmised paketid"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti (%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (j/E) "
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "Kas eemaldada %d paketti?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (j/E) "
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "Eemaldamine ebaõnnestus"
 
@@ -638,216 +599,263 @@ msgstr ""
 "kasutamine:\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - näitab programmi versiooni.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
 "                   vearaportideks).\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, 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:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - kasutatakse ainult määratud andmekandjaid (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - selgitav režiim.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - tõstutundetu igas olukorras.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - tõstu arvestamine mustrites (vaikimisi).\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - väljade eraldaja muutmine (vaikimisi ':').\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mustriavaldised:\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, 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:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binaaroperaator AND.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binaaroperaator OR.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaaroperaator NOT.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parem- ja vasakpoolne sulg.\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "Siltide nimekiri:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - printf laadis vormindatud väljund\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   näide: '%%name:%%files'\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arhitektuur\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - valmistajamasin\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - valmistamisaeg\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfiguratsioonifailid\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - konfliktide sildid\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - paketi kirjeldus\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distributsioon\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epohh\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketi failinimi\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketi failide nimekiri\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupp\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - paketi nimi\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - iganenute sildid\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - paketi valmistaja\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - pakutavate sildid\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - nõutavate sildid\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - paigalduse suurus\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - lähtekoodi RPM-i nimi\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - kokkuvõte\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - tootja\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paketti sisaldav andmekandja\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, 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:136
+#: ../urpmf:137
+#, 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:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "spetsiifilise keskkonna kasutamine %s -l\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -855,11 +863,12 @@ msgstr ""
 "Märkus: kuna ükski otsitud andmekandja ei kasutanud hdlisti, ei suutnud "
 "urpmf mingit tulemust anda\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Paketi otsimiseks nime järgi tasuks pruukida võtit --name.\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -876,14 +885,16 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - soovitud pakettide otsinguks kasutatakse ainult määratud "
 "andmekandjaid.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
@@ -891,12 +902,29 @@ msgstr ""
 "  --auto         - mitteinteraktiivne režiim, eeldatakse kõigile küsimustele "
 "vaikimisi pakutavaid vastuseid.\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - valib automaatselt paketid süsteemi uuendamiseks.\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - valib automaatselt paketid süsteemi uuendamiseks.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - sunnib uuendama gpg võtit.\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
@@ -904,11 +932,13 @@ msgstr ""
 "  --no-uninstall - kunagi ei paluta paketti eemaldada, paigaldusest "
 "loobuda.\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - pakette ei paigaldata (ainult tõmmatakse).\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -916,7 +946,7 @@ msgstr ""
 "  --keep         - säilitab võimalusel olemasolevad paketid, lükkab tagasi\n"
 "                   soovitud paketid, mis toovad kaasa eemaldamise.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -927,33 +957,39 @@ msgstr ""
 "                   uuendatakse enam kui määratud arv pakette,\n"
 "                   vaikimisi on see %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - väikese tehingu pikkus, vaikimisi %d.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - lubab ebatäpset otsingut.\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - järgmine pakett on lähtetekstipakett.\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - paigaldab ainult lähtetekstipaketi (mitte binaarpaketi).\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - eemaldab enne muud tegevust RPM-i puhvrist.\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - säilitab puhvris mittekasutatud RPM-id.\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -961,7 +997,8 @@ msgstr ""
 "  --allow-nodeps - lubab kasutajal paigaldamise\n"
 "                   pakettide sõltuvusi kontrollimata.\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -969,11 +1006,13 @@ msgstr ""
 "  --allow-force  - lubab kasutajal paigaldada pakette ilma\n"
 "                   sõltuvusi ja sobivust kontrollimata.\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - muu baasi kasutamine RPM-ide paigaldamisel.\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -981,39 +1020,48 @@ msgstr ""
 "  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal,\n"
 "                   kasulik chroot paigaldamiseks võtmega --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - wget kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - curl'i kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - prozilla kasutamine kaugfailide tõmbamiseks.\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - curl'i lisavõtmed\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- rsync'i lisavõtmed\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - wget'i lisavõtmed\n"
 
 #: ../urpmi:127
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - prozilla lisavõtmed\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - piirab allalaadimiskiirust.\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1021,7 +1069,8 @@ msgstr ""
 "  --resume       - taasalustab osaliselt alla tõmmatud failide tõmbamist\n"
 "                   (--no-resume tühistab selle, vaikimisi on väljas).\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1030,7 +1079,8 @@ msgstr ""
 "eeldatavalt\n"
 "                   vaikimisi 1080 (vorming on <puhverserver[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1039,6 +1089,7 @@ msgstr ""
 "                   autentimiseks (vorming: <kasutajanimi:parool>).\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1047,6 +1098,7 @@ msgstr ""
 "                   järgnevas argumendis.\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1055,6 +1107,7 @@ msgstr ""
 "                   (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1062,40 +1115,39 @@ msgstr ""
 "  --test         - kontrollitakse, kas paigaldus on korrektselt võimalik.\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eirab asukohta (või asukohti, eraldajaks koma).\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - jätab välja dokumentatsioonifailid.\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - kettaruumi ei kontrollita enne paigaldamist.\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - lubab paigaldada sobimatule arhitektuurile mõeldud RPM-"
 "e.\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - sunnib uuendama gpg võtit.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - paigaldamisel vahele jäetavad paketid.\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1103,40 +1155,48 @@ msgstr ""
 "  --more-choices - mitme paketi leidmisel pakutakse lisaks vaikevalikule\n"
 "                   ka teisi valikuid.\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - RPM-ide andmebaasi ei lukustata.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - uuendatakse ainult senise arhitektuuriga pakette.\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - valib kõik käsureaga sobivad.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - lubab pakette otsida pakutavate seas.\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ei luba pakettide otsimist pakutavate seas.\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - vaikne režiim.\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  paigaldatakse käsureal antud nimed või RPM-failid.\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Viga: võtit --auto-select ei saa kasutada koos pakettide loendiga.\n"
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
@@ -1144,11 +1204,12 @@ msgstr ""
 "Viga: vearaporti loomiseks kasutage koos võtmega --bug\n"
 "tavalisi käsureaargumente.\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Binaarseid RPM-faile ei saa paigaldada võtme --install-src kasutamisel"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1157,21 +1218,22 @@ msgstr ""
 "Kataloog [%s] on juba olemas, palun kasutage vearaportideks muud kataloogi "
 "või kustutage see"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "Kopeerimine ebaõnnestus"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Keskkonna kataloogi %s ei ole olemas"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1180,52 +1242,59 @@ msgstr ""
 "Viga: %s paistab olevat haagitud ainult loetavana.\n"
 "Kasutage operatsiooni pealesundimiseks võtit --allow-force."
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "Andmekandja uuendamine...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uuendus)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uuendus)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (paigaldus)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (paigaldus)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Millise valite? (1-%d) "
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, c-format
 msgid ""
+"The following package cannot be installed because it depends on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgid_plural ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Järgmisi pakette ei saa paigaldada, sest nad sõltuvad pakettidest, mis on "
+"vanemad kui paigaldatud paketid:\n"
+"%s"
+msgstr[1] ""
 "Järgmisi pakette ei saa paigaldada, sest nad sõltuvad pakettidest, mis on "
 "vanemad kui paigaldatud paketid:\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1233,58 +1302,80 @@ msgstr ""
 "\n"
 "Kas siiski paigaldamist jätkata?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Mõnda soovitud paketti ei õnnestu paigaldada:\n"
+"%s"
+msgstr[1] ""
 "Mõnda soovitud paketti ei õnnestu paigaldada:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, c-format
 msgid ""
+"The installation cannot continue because the following package\n"
+"has to be removed for others to be upgraded:\n"
+"%s\n"
+msgid_plural ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Paigaldamist ei saa jätkata, sest teiste uuendamiseks tuleb eemaldada\n"
+"järgmised paketid:\n"
+"%s\n"
+msgstr[1] ""
 "Paigaldamist ei saa jätkata, sest teiste uuendamiseks tuleb eemaldada\n"
 "järgmised paketid:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
+"%s"
+msgstr[1] ""
 "Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei eemaldata)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid"
+msgstr[1] "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d pakett(i), %d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1293,88 +1384,106 @@ msgstr ""
 "Järgmiste sõltuvuste paigaldamiseks peate olema administraator:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(ainult test, tegelikult midagi ei paigaldata)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Kas paigaldada %d paketti? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "Kas paigaldada %d paketti? (%d MB)"
+msgstr[1] "Kas paigaldada %d paketti? (%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "Vajutage Enter, kui see on tehtud..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Järgmistel pakettidel on vigane signatuur"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Järgmistel pakettidel on vigane signatuur"
+msgstr[1] "Järgmistel pakettidel on vigane signatuur"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Kas jätkata paigaldusega?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "%s jaotamine"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "%s paigaldamine andmekandjalt %s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "%s paigaldamine"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "Paigaldamine ebaõnnestus:"
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d paigaldamistehingut ebaõnnestus"
 
-#: ../urpmi:824
-msgid "Packages are up to date"
-msgstr "Pole ühtegi paketti uuendada"
-
-#: ../urpmi:827
+#: ../urpmi:828
 #, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketid %s on juba paigaldatud"
+msgid "Installation is possible"
+msgstr "Paigaldamine on võimalik"
 
-#: ../urpmi:828
+#: ../urpmi:833
 #, c-format
+msgid "Packages are up to date"
+msgstr "Pole ühtegi paketti uuendada"
+
+#: ../urpmi:840
+#, fuzzy, c-format
 msgid "Package %s is already installed"
-msgstr "Pakett %s on juba paigaldatud"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Pakett %s on juba paigaldatud"
+msgstr[1] "Pakett %s on juba paigaldatud"
 
-#: ../urpmi:847
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Paketid %s on juba paigaldatud"
+msgstr[1] "Paketid %s on juba paigaldatud"
+
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1397,45 +1506,55 @@ msgstr ""
 "ja [võti] on üks järgmistest\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - loob uuendatava andmekandja.\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis             - püütakse kasutada sünteesifaili.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
+msgstr "    --probe-synthesis - kasutatakse sünteesifaili.\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - püütakse kasutada hdlist-faili.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
+msgstr "    --probe-hdlist - kasutatakse hdlist-faili.\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - ei püüta kasutada sünteesi-\n"
 "                   või hdlist-faili.\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 "  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, 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:62
+#: ../urpmi.addmedia:64
+#, 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:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1444,7 +1563,8 @@ msgstr ""
 "  --from         - kasutab määratud URL-i peeglite loendi jaoks, vaikimisi\n"
 "                   on see %s\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1452,49 +1572,70 @@ msgstr ""
 "  --virtual      - loob virtuaalse andmekandja, mis on alati värske,\n"
 "                   lubatud on ainult protokoll file://.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - lisatud andmekandja avalikku võtit ei impordita\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, 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:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - puhastab päistepuhvri kataloogi.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - sunnib genereerima hdlist-faile.\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - vaikne režiim.\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - selgitav režiim.\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Andmekandjaid võib lisada ainult administraator"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "Luuakse seadistustefail [%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Seadistustefaili [%s] loomine ebaõnnestus"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 "võtme --distrib puhul puudub vajadus anda <suhteline tee hdlist juurde>"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1503,16 +1644,17 @@ msgstr ""
 "\n"
 "Kas soovite lisada andmekandja '%s'?"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "Puudub <suhteline tee hdlist juurde>\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "võrguandmekandjal peab olema määratud `with'\n"
+#: ../urpmi.addmedia:169
+#, fuzzy, c-format
+msgid "Can't use %s with remote medium"
+msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
@@ -1535,32 +1677,38 @@ msgstr ""
 "kasutamine:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - määrab taaspakendamise alguspunkti\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
 "  --noclean      - taaspakendamise kataloogi kontrollpunktis ei puhastata\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - tehingute nimekiri alates määratud kuupäevast/"
 "ajavahemikus\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr ""
 "  --list-all     - kõigi RPM-ide andmebaasis olevate tehingute nimekiri "
 "(pikk)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe    - kõigi tehingute nimekiri alates kontrollpunktist\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
@@ -1568,118 +1716,121 @@ msgstr ""
 "  --rollback     - taastamine konkreetse kuupäeva järgi\n"
 "                   või määratud tehingute arvu järgi\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - taaspakendamine keelatakse\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "Vigane kuupäev või kestvus [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "Taaspakendamiskataloog pole määratud\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "Kirjutamine taaspakendamiskataloogi ebaõnnestus [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "Taaspakendamiskataloogi puhastamine [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "%d faili eemaldatud\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "Vigased käsureaargumendid [%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "Korraga ei saa kasutada võtit --checkpoint ja --rollback\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "Korraga ei saa kasutada võtit --checkpoint ja --list\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "Korraga ei saa kasutada võtit --rollback ja --list\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "Võtit --disable ei saa kasutada koos teiste võtmetega"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "Ei leitud ühtegi tehingut alates %s\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "Selleks peavad olema administraatori õigused"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "RPM-i makrofaili kirjutamine [%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "Taastamiskuupäeva ei leitud\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "Taastamine seisuga %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "Taaspakendamise keelamine\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "kasutamine: urpmi.removemedia [-a] <nimi> ...\n"
 "kus <nimi> on eemaldatava andmekandja nimi.\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - valib kõik andmekandjad.\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - andmekandjate ligilähedane sobivus.\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tundmatu võti '%s'\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Andmekandjaid võib eemaldada ainult administraator"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "ei ole midagi eemaldada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1689,6 +1840,7 @@ msgstr ""
 "(võimalikud: %s)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1697,32 +1849,48 @@ msgstr ""
 "kus <nimi> on uuendatava andmekandja nimi.\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - uuendab ainult uuendus-andmekandjat.\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - sunnib uuendama gpg võtit.\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - uuendamist ette ei võeta, andmekandjat eiratakse.\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 "  --no-ignore    - uuendamist ette ei võeta, andmekandjat siiski "
 "arvestatakse.\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - valib kõik mitte-eemaldatavad andmekandjad.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - sunnib genereerima hdlist-faile.\n"
+
+#: ../urpmi.update:70
+#, c-format
 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:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1731,21 +1899,21 @@ msgstr ""
 "puudub uuendatava kirje nimi\n"
 "(võimalikud: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "andmekandja %s arvestamine"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "andmekandja %s ignoreerimine"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "andmekandja %s arvestamine"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1764,6 +1932,7 @@ msgstr ""
 "kasutamine:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1772,43 +1941,52 @@ msgstr ""
 "kasutatakse ainult määratud andmekandjaid.\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - lubab ebatäpset otsingut (sama, mis -y).\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - näitab saadaolevaid pakette.\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - näitab saadaolevaid andmekandjaid.\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - näitab saadaolevaid andmekandjaid URL-idega.\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - näitab saadaolevaid sõlmi, kui kasutatakse võtit --"
 "parallel.\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - näitab saadaolevaid aliaseid.\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - seadistusest tehakse tõmmis kujul urpmi.addmedia võti.\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - järgmine pakett on lähtetekstipakett (sama, mis -s).\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
@@ -1816,10 +1994,12 @@ msgstr ""
 "(ainult administraator).\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - lubab sobimatu arhitektuuriga RPM-ide päringuid.\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -1827,102 +2007,200 @@ msgstr ""
 "  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal.\n"
 "                   Võimaldab esitada päringu distributsiooni kohta.\n"
 
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - näitab muutuste logi.\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - näitab kokkuvõtet.\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - täielik väljund eemaldatavate pakettidega.\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - laiendab päringut paketi sõltuvustele.\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - näitab koos nimega ka gruppi.\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - näitab kasulikku infot ka inimesele arusaadaval kujul.\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - näitab faile paketis.\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 "  -P             - ei luba pakettide otsimist pakutavate seas (vaikimisi).\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - lubab pakette otsida pakutavate seas.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - näitab koos nimega ka versiooni ja väljalaset.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - kohandab otsingu sellele, mida pakett nõuab.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - laiendatud kohandatud otsing (kaasa arvatud virtuaalsed "
 "paketid).\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - järgmine pakett on lähtetekstipakett (sama, mis --src).\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 "  -u             - eemaldab paketi, kui uuem versioon on juba paigaldatud.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - lubab ebatäpset otsingut (sama, mis --fuzzy).\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - nagu -y, aga sunnib sobivusi leidma tõstutundetult.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  päringu esitamine käsureal antud nimede või RPM-failide kohta.\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "andmekandja %s jäetakse vahele: hdlist puudub"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "Failinimekirja ei leitud\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "Muutuste logi ei leitud\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput ebaõnnestus, võib-olla pole sõlm kättesaadav"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "sõlmes %s on urpme vana versioon, palun uuendage"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp ebaõnnestus, võib-olla pole sõlm kättesaadav"
+
+#~ msgid "on node %s"
+#~ msgstr "sõlmes %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Sünteesifaili levitamine sõlmedes"
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Sõltuvuste lahendamine sõlmedes..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Failide jagamine sõlmedesse..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Paigaldamise võimalikkuse kontroll sõlmedes..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Paigaldamine ebaõnnestus sõlmes %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Pakettide paigaldamine sõlmedes..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "scp ebaõnnestus masinas %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Sünteesifaili levitamine masinasse %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Sõltuvuste lahendamine masinas %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "masinas %s puudub urpmi korralik versioon (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Failide jagamine masinasse %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Paigaldamise võimalikkuse kontroll masinas %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Paigaldamine masinas %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "%s paigaldamine masinas %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Paigaldamiseks valmistumine masinas %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr ""
+#~ "  --probe-synthesis             - püütakse kasutada sünteesifaili.\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - püütakse kasutada hdlist-faili.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "võrguandmekandjal peab olema määratud `with'\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "tundmatu võti '%s'\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "tundmatu protokoll %s jaoks"