changed name of _() function to N()

use of perl_checker to create pot file

1 files changed, 1200 insertions, 1029 deletions

diff --git a/po/et.po b/po/et.po
index ee216f72..b34582ce 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-03-05 19:38+0100\n"
+"POT-Creation-Date: 2003-03-05 21:19+0100\n"
 "PO-Revision-Date: 2003-01-15 15:23+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -14,1136 +14,1253 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "%s paigaldamine\n"
+#. This is a list of chars acceptable as a 'yes' answer to a Yes/No question;
+#. you can put here the letters for 'yes' for your language, so people
+#. can hit those keys in their keyboard to reply.
+#. please keep the 'Yy' for compatibility reasons
+#.
+#: placeholder.h:11
+msgid "Yy"
+msgstr "JjYy"
 
-#: ../_irpm_.c:33
+#. This is a list of chars acceptable as a 'no' answer to a Yes/No question;
+#. you can put here the letters for 'no' for your language, so people
+#. can hit those keys in their keyboard to reply.
+#. please keep the 'Nn' for compatibility reasons
+#.
+#: placeholder.h:17
+msgid "Nn"
+msgstr "EeNn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versioon %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Autoriõigus (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+
+#: placeholder.h:20
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
 msgstr ""
-"Automaatne pakettide paigaldamine...\n"
-"Soovisite paigaldada paketti %s\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Kas sobib?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "kasutamine: urpmf [võti] <fail>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Olgu"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - välja nime ei näidata (vaikimisi, kui välja ei ole antud "
+"käsureal, "
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Katkesta"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    mis ei sobi kokku interaktiivse resiimiga)."
 
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:386 ../urpmi_.c:426
-#: ../urpmi_.c:473 ../urpmi_.c:538 ../urpmi_.c:602 placeholder.h:17
-msgid "Nn"
-msgstr "EeNn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - näitab kõiki välju."
 
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:387 ../urpmi_.c:427
-#: ../urpmi_.c:474 ../urpmi_.c:539 ../urpmi_.c:603 placeholder.h:11
-msgid "Yy"
-msgstr "JjYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - näitab välja name: rpm-faili nimi (eeldatavalt, kui "
+"välja ei ole "
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/e) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    määratud käsureal, aga ilma paketi nimeta)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - näitab välja group: grupp."
 
-#: ../_irpm_.c:63
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - näitab välja size: suurus."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - näitab välja serial: seerianumber."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - näitab välja summary: kokkuvõte."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - näitab välja description: kirjeldus."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - näitab välja provides: kõik pakutavad (mitu rida)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - näitab välja requires: kõik nõutavad (mitu rida)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - näitab välja files: kõik failid (mitu rida)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - näitab välja conflicts: kõik konfliktid (mitu rida)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr "  --obsoletes     - näitab välja obsoletes: kõik iganenud (mitu rida)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - näitab välja prereqs: kõik eelnõutavad (mitu rida)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "rohkem infot võtmete kohta leiab käsuga urpmf --help"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "täielikku andmekandjate loendit ei leitud"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: ei tunne seda käsku\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Tundmatu veebitõmbaja '%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (J/e) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "Tundmatu protokoll %s jaoks"
+msgid "Cancel"
+msgstr "Katkesta"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "ei leitud ühtegi veebitõmbajat (praegu curl või wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Olgu"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ei suuda käsitleda protokolli: %s"
+msgid "Is this OK?"
+msgstr "Kas sobib?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kopeerimine ebaõnnestus: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automaatne pakettide paigaldamine...\n"
+"Soovisite paigaldada paketti %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget puudub\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "%s paigaldamine\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
+msgid "unable to open rpmdb"
+msgstr "rpmdb avamine ebaõnnestus"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl puudub\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
+msgid "%s conflicts with %s"
+msgstr "%s ja %s on konfliktis"
 
-#: ../urpm.pm_.c:572
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
+msgid "%s is needed by %s"
+msgstr "%s on vajalik %s jaoks"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
+msgid "unable to install package %s"
+msgstr "paketi %s paigaldamine ebaõnnestus"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
+msgid "unable to remove package %s"
+msgstr "paketi %s eemaldamine ebaõnnestus"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
+msgid "...retrieving failed: %s"
+msgstr "Eemaldamine ebaõnnestus"
 
-#: ../urpm.pm_.c:600
-#, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, c-format
+msgid "...retrieving done"
+msgstr ""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
+msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid ""
+"medium \"%s\" use an invalid list file (mirror is problably not up-to-date, "
+"trying to use alternate method)"
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s sisaldub järgmistes pakettides: %s"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "no package named %s"
+msgstr "tundmatud paketid"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
 msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
+msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "invalid rpm file name [%s]"
 msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
-
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
+msgid "mounting %s"
+msgstr "%s paigaldamine\n"
 
-#: ../urpm.pm_.c:811 ../urpm.pm_.c:819 ../urpm.pm_.c:834 ../urpm.pm_.c:1104
-#: ../urpm.pm_.c:1214 ../urpm.pm_.c:1391 ../urpm.pm_.c:1454 ../urpm.pm_.c:1472
-#: ../urpm.pm_.c:1619
+#: ../urpm.pm:1
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:815 ../urpm.pm_.c:830 ../urpm.pm_.c:1101 ../urpm.pm_.c:1210
-#: ../urpm.pm_.c:1387 ../urpm.pm_.c:1460 ../urpm.pm_.c:1466 ../urpm.pm_.c:1543
-#: ../urpm.pm_.c:1614
+#: ../urpm.pm:1
 #, c-format
-msgid "examining synthesis file [%s]"
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "rpmdb avamine ebaõnnestus"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:933
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
-
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "kopeerimine ebaõnnestus: %s"
-
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+#: ../urpm.pm:1
+#, c-format
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:1
+#, c-format
+msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
+#: ../urpm.pm:1
+#, c-format
+msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "Eemaldamine ebaõnnestus"
+msgid "unable to write list file of \"%s\""
+msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
+#: ../urpm.pm:1
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy of [%s] failed"
-msgstr "kopeerimine ebaõnnestus: %s"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
+msgid "...copying failed"
+msgstr "kopeerimine ebaõnnestus: %s"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy of [%s] failed"
+msgstr "kopeerimine ebaõnnestus: %s"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1480
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
-
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr ""
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
+msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access first installation medium"
+msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "problem reading hdlist file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "mounting %s"
-msgstr "%s paigaldamine\n"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
-#, c-format
-msgid "unable to access rpm file [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to write config file [%s]"
 msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
+#: ../urpm.pm:1
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1960
-#, fuzzy, c-format
-msgid "no package named %s"
-msgstr "tundmatud paketid"
-
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s sisaldub järgmistes pakettides: %s"
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:2105 ../urpm.pm_.c:2137 ../urpm.pm_.c:2159
+#: ../urpm.pm:1
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:2147
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:2171
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"medium \"%s\" use an invalid list file (mirror is problably not up-to-date, "
-"trying to use alternate method)"
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+#: ../urpm.pm:1
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "paketi %s eemaldamine ebaõnnestus"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "paketi %s paigaldamine ebaõnnestus"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "syntax error in config file at line %s"
+msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s on vajalik %s jaoks"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% tehtud, kiirus = %s"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s ja %s on konfliktis"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% %s -st tehtud, aega jäänud (olet.) = %s, kiirus = %s"
 
-#: ../urpm/parallel_ka_run.pm_.c:9 ../urpm/parallel_ka_run.pm_.c:91
-#: ../urpm/parallel_ka_run.pm_.c:178
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput ebaõnnestus, võib-olla ei ole sõlm kättesaadav"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:65 ../urpm/parallel_ka_run.pm_.c:163
-#: ../urpm/parallel_ka_run.pm_.c:192
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp ebaõnnestus, võib-olla ei ole sõlm kättesaadav"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh puudub\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "sõlmel %s"
+msgid "rsync is missing\n"
+msgstr "rsync puudub\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, c-format
-msgid "Installation failed on node %s"
-msgstr "Paigaldamine ebaõnnestus sõlmel %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-msgid "Installation is possible"
-msgstr "Paigaldamine on võimalik"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl puudub\n"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, c-format
-msgid "scp failed on host %s"
-msgstr "scp ebaõnnestus masinal %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "masinal %s ei ole korralikku urpmi versiooni"
+msgid "wget is missing\n"
+msgstr "wget puudub\n"
 
-#: ../urpme_.c:39
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\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 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine:\n"
+msgid "copy failed: %s"
+msgstr "kopeerimine ebaõnnestus: %s"
 
-#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
-#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:62 ../urpmi_.c:72
-#: ../urpmq_.c:40
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - selle abiteate näitamine.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "ei suuda käsitleda protokolli: %s"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "ei leitud ühtegi veebitõmbajat (praegu curl või wget)\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "Tundmatu protokoll %s jaoks"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Tundmatu veebitõmbaja '%s' !!!\n"
+
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Eemaldamine ebaõnnestus"
+
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - kontroll, kas paigaldus on korrektselt võimalik.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Sõltuvuste lahendamiseks tuleb eemaldada järgmised paketid (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
-"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
-"masina.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Kontrollin, kas on võimalik eemaldada järgmised paketid"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Pole midagi eemaldada"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
+msgid "removing package %s will break your system"
+msgstr "paketi %s eemaldamine halvab Teie süsteemi"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "tundmatu pakett"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "tundmatud paketid"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "paketi %s eemaldamine halvab Teie süsteemi"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Pole midagi eemaldada"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Kontrollin, kas on võimalik eemaldada järgmised paketid"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
+"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
+"masina.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
-msgstr "Sõltuvuste lahendamiseks tuleb eemaldada järgmised paketid (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - kontroll, kas paigaldus on korrektselt võimalik.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Eemaldamine ebaõnnestus"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
+
+#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
+#: ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - selle abiteate näitamine.\n"
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, c-format
 msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"urpmf versioon %s\n"
-"Autoriõigus (C) 2002 MandrakeSoft.\n"
+"urpme versioon %s\n"
+"Autoriõigus (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
 "Litsentsi tingimustele.\n"
 "\n"
 "kasutamine:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - ainult andmekandja uuendamine.\n"
-
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
-"  --media        - ainult määratud andmekandja(te) kasutamine (eraldajaks "
-"koma).\n"
-
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - sünteesi kasutamine urpmi andmebaasi asemel.\n"
-
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - selgitav resiim.\n"
-
-#: ../urpmf_.c:36
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-"  --quiet         - välja nime ei näidata (vaikimisi, kui välja ei ole "
-"antud\n"
-"                    käsureal, mis ei sobi interaktiivsesse resiimi).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - näitab kõiki välju.\n"
-
-#: ../urpmf_.c:39
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"  --name          - näitab välja name: rpm-faili nimi (eeldatavalt, kui "
-"välja\n"
-"                    ei ole antud käsureal, aga ilma paketi nimeta).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - näitab välja group: grupp.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - näitab välja size: suurus.\n"
-
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch         - näitab välja epoch: epohh.\n"
-
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - näitab välja summary: kokkuvõte.\n"
-
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - näitab välja description: kirjeldus.\n"
+"väljakutse on :\n"
+"%s\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr ""
-"  --provides      - näitab välja provides: kõik pakutavad (mitu rida).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - parempoolne sulg rühmaavaldise lõpetamiseks.\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
-msgstr ""
-"  --requires      - näitab välja requires: kõik nõutavad (mitu rida).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - vasakpoolne sulg rühmaavaldise alustamiseks.\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - näitab välja files: kõik failid (mitu rida).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - binaaroperaator NOT: tõene, kui avaldis on väär.\n"
 
-#: ../urpmf_.c:49
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --conflicts     - näitab välja conflicts: kõik konfliktid (mitu rida).\n"
+"  -o             - binaaroperaator OR: tõene, kui üks avaldis on tõene.\n"
 
-#: ../urpmf_.c:50
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --obsoletes     - näitab välja obsoletes: kõik iganenud (mitu rida).\n"
+"  -a             - binaaroperaator AND: tõene, kui mõlemad avaldised on "
+"tõesed.\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - tõstutundetu igas olukorras.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - kaasa otseselt perli kood kui perl -e.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
+#: ../urpmf:1 ../urpmq:1
+#, 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_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - kaasa otseselt perli kood kui perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - tõstutundetu igas olukorras.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  -a             - binaaroperaator AND: tõene, kui mõlemad avaldised on "
-"tõesed.\n"
+"  --obsoletes     - näitab välja obsoletes: kõik iganenud (mitu rida).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  -o             - binaaroperaator OR: tõene, kui üks avaldis on tõene.\n"
-
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - binaaroperaator NOT: tõene, kui avaldis on väär.\n"
-
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - vasakpoolne sulg rühmaavaldise alustamiseks.\n"
+"  --conflicts     - näitab välja conflicts: kõik konfliktid (mitu rida).\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - parempoolne sulg rühmaavaldise lõpetamiseks.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - näitab välja files: kõik failid (mitu rida).\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"väljakutse on :\n"
-"%s\n"
+"  --requires      - näitab välja requires: kõik nõutavad (mitu rida).\n"
 
-#: ../urpmi.addmedia_.c:44
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"kasutamine: urpmi.addmedia [võti] <nimi> <url> [with <suhteline_tee>]\n"
-"kus <url> on esitatud kujul\n"
-"       file://<asukoht>\n"
-"       ftp://<kasutajanimi>:<parool>@<masin>/<asukoht> with <suhteline tee "
-"hdlist juurde>\n"
-"       ftp://<masin>/<asukoht> with <suhteline tee hdlist juurde>\n"
-"       http://<masin>/<asukoht> with <suhteline tee hdlist juurde>\n"
-"       removable://<tee>\n"
-"\n"
-"ja [võti] on üks järgmistest\n"
+"  --provides      - näitab välja provides: kõik pakutavad (mitu rida).\n"
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - wget kasutamine kaugfailide tõmbamiseks.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - näitab välja description: kirjeldus.\n"
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - curl kasutamine kaugfailide tõmbamiseks.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - näitab välja summary: kokkuvõte.\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - piirab allalaadimiskiirust.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch         - näitab välja epoch: epohh.\n"
 
-#: ../urpmi.addmedia_.c:57 ../urpmi.update_.c:66 ../urpmi_.c:92 ../urpmq_.c:58
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - määratud HTTP vahendaja kasutamine, pordinumber on "
-"eeldatavalt\n"
-"                   vaikimisi 1080 (vorming on <proxyhost[:port]>).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - näitab välja size: suurus.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - näitab välja group: grupp.\n"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  --proxy-user   - määrab kasutatava kasutaja ja parooli vahendaja\n"
-"                   autentimiseks (vorming: <kasutajanimi:parool>).\n"
+"  --name          - näitab välja name: rpm-faili nimi (eeldatavalt, kui "
+"välja\n"
+"                    ei ole antud käsureal, aga ilma paketi nimeta).\n"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - loob uuendatava andmekandja.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - näitab kõiki välju.\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
+"  --quiet         - välja nime ei näidata (vaikimisi, kui välja ei ole "
+"antud\n"
+"                    käsureal, mis ei sobi interaktiivsesse resiimi).\n"
 
-#: ../urpmi.addmedia_.c:64
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
-msgstr ""
-"  --distrib-XXX  - loob automaatselt andmekandja distributsiooni\n"
-"                    osale XXX, kus XXX võib olla main, contrib, updates\n"
-"                    või mis tahes muu seadistatud määratlus ;-)\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - selgitav resiim.\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmf:1 ../urpmq:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - kasutab määratud url-i peeglite loendi jaoks, vaikimisi\n"
-"                   on see %s\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - sünteesi kasutamine urpmi andmebaasi asemel.\n"
 
-#: ../urpmi.addmedia_.c:69
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  --version      - kasutab määratud versiooni, vaikimisi on see\n"
-"                   paigaldatud paketi 'mandrake-release' versioon.\n"
+"  --media        - ainult määratud andmekandja(te) kasutamine (eraldajaks "
+"koma).\n"
 
-#: ../urpmi.addmedia_.c:72
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - ainult andmekandja uuendamine.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --arch         - kasutab määratud arhitektuuri, vaikimisi on see\n"
-"                   paigaldatud paketi 'mandrake-release' arhitektuur.\n"
+"urpmf versioon %s\n"
+"Autoriõigus (C) 2002 MandrakeSoft.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - puhastab päistepuhvri kataloogi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "kõik on juba paigaldatud"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - püüab leida ja kasutada sünteesi-\n"
-"                   või hdlist-faili.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Paigaldamine on võimalik"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - sunnib genereerima hdlist-faile.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Paigaldamine ebaõnnestus"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "cookeri distributsiooni uuenduste lisamine ebaõnnestus\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
+
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "%s jaotamine\n"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Installation failed, some files are missing:\n"
 "%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"You may want to update your urpmi database"
 msgstr ""
+"Paigaldamine ebaõnnestus, mõned failid puudusid:\n"
 "%s\n"
-"võtme --distrib puhul puudub vajadus anda <suhteline tee hdlist juurde>"
+"Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
+msgid " (y/N) "
+msgstr " (j/E) "
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Kas jätkata paigaldusega?"
+
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Järgmistel pakettidel on vigane signatuur"
+
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Vajutage Enter, kui see on tehtud..."
+
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "ei leia pakette, katkestan"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid (%d MB)"
+
+#: ../urpmi:1
+#, c-format
+msgid ""
+"You need to be root to install the following dependencies:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
 msgstr ""
+"Järgmiste sõltuvuste paigaldamiseks peate olema administraator:\n"
 "%s\n"
-"Puudub <suhteline tee hdlist juurde>\n"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
 "%s\n"
-"`with' puudub ftp-andmekandja jaoks\n"
+"Kas olete nõus?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
+msgid "unrequested"
+msgstr "soovimata"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"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:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "konflikti tõttu %s -ga"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - kõigi andmekandjate valimine.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "puuduva %s tõttu"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tundmatu võti '%s'\n"
+msgid "due to unsatisfied %s"
+msgstr "rahuldamata %s tõttu"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ei ole midagi eemaldada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "paigaldamaks %s"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
 msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
-"puudub eemaldatava kirje nimi\n"
-"(võimalikke %s)\n"
+"Mõnda soovitud paketti ei õnnestunud paigaldada:\n"
+"%s\n"
+"Kas olete nõus?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"kasutamine: urpmi.update [võti] <nimi> ...\n"
-"kus <nimi> on uuendatava andmekandja nimi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - ainult uuendus-andmekandja uuendamine.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Millise(d) valite? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - kõigi mitte-eemaldatavate andmekandjate valimine.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d             - fail depslist.ordered arvutatakse täielikult.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "%s paigaldamiseks on vajalik üks järgnevatest pakettidest:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Pakette võib paigaldada ainult administraator"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"puudub uuendatava kirje nimi\n"
-"(võimalikke %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "spetsiifilise keskkonna kasutamine %s -l\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Mida teha binaarsete rpm-failidega võtme --install-src kasutamisel"
+
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"urpmi versioon %s\n"
-"Autoriõigus (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine:\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - sünteesi kasutamine urpmi andmebaasi asemel.\n"
+#: ../urpmi:1
+#, 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_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automaatne paketivalik süsteemi uuendamiseks.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - selgitav resiim.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - ebatäpse otsingu lubamine (sama, mis -y).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - vaikne resiim.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --src          - järgmine pakett on lähtetekstipakett (sama, mis -s).\n"
+"  -s             - järgmine pakett on lähtetekstipakett (sama, mis --src).\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - paigaldab ainult lähtetekstipaketi (mitte binaarpaketi).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - ebatäpse otsingu lubamine (sama, mis --fuzzy).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - enne muud tegevust rpm-i eemaldamine puhvrist.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ei luba pakettide otsimist pakutavate seas.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - mittekasutatud rpm-i säilitamine puhvris.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - lubab pakette otsida pakutavate seas.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-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"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - valib kõik käsureaga sobivad.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - lubab kasutajal paigaldamise\n"
-"                   pakettide sõltuvusi kontrollimata.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - eirab asukohta (või asukohti, eraldajaks koma).\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --allow-force  - lubab kasutajal paigaldada pakette ilma\n"
-"                   sõltuvusi ja sobivust kontrollimata.\n"
+"  --verify-rpm   - rpm signatuuri kontroll enne paigaldust\n"
+"                   (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --bug          - vearaport väljastatakse kataloogi, mis on ära näidatud\n"
-"                   järgnevas argumendis.\n"
+"  --best-output  - keskkonnale vastava parima resiimi valik: kas X või\n"
+"                   tekstiresiim.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - X-i kasutamine.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1151,432 +1268,486 @@ msgstr ""
 "  --env          - spetsiifilise keskkonna kasutamine (tavaliselt\n"
 "                   vearaportideks).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - X-i kasutamine.\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --best-output  - keskkonnale vastava parima resiimi valik: kas X või\n"
-"                   tekstiresiim.\n"
+"  --bug          - vearaport väljastatakse kataloogi, mis on ära näidatud\n"
+"                   järgnevas argumendis.\n"
 
-#: ../urpmi_.c:103
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --verify-rpm   - rpm signatuuri kontroll enne paigaldust\n"
-"                   (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - eirab asukohta (või asukohti, eraldajaks koma).\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - valib kõik käsureaga sobivad.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - lubab pakette otsida pakutavate seas.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ei luba pakettide otsimist pakutavate seas.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - ebatäpse otsingu lubamine (sama, mis --fuzzy).\n"
+"  --proxy-user   - määrab kasutatava kasutaja ja parooli vahendaja\n"
+"                   autentimiseks (vorming: <kasutajanimi:parool>).\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  -s             - järgmine pakett on lähtetekstipakett (sama, mis --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - vaikne resiim.\n"
+"  --proxy        - määratud HTTP vahendaja kasutamine, pordinumber on "
+"eeldatavalt\n"
+"                   vaikimisi 1080 (vorming on <proxyhost[:port]>).\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - selgitav resiim.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - piirab allalaadimiskiirust.\n"
 
-#: ../urpmi_.c:114
-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:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - curl kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - wget kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Mida teha binaarsete rpm-failidega võtme --install-src kasutamisel"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - lubab kasutajal paigaldada pakette ilma\n"
+"                   sõltuvusi ja sobivust kontrollimata.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - lubab kasutajal paigaldamise\n"
+"                   pakettide sõltuvusi kontrollimata.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "spetsiifilise keskkonna kasutamine %s -l\n"
+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"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Pakette võib paigaldada ainult administraator"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - mittekasutatud rpm-i säilitamine puhvris.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s paigaldamiseks on vajalik üks järgnevatest pakettidest:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - enne muud tegevust rpm-i eemaldamine puhvrist.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on üks järgnevatest pakettidest:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - paigaldab ainult lähtetekstipaketi (mitte binaarpaketi).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Millise(d) valite? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - järgmine pakett on lähtetekstipakett (sama, mis -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - ebatäpse otsingu lubamine (sama, mis -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
-msgstr ""
-"Mõnda soovitud paketti ei õnnestunud paigaldada:\n"
-"%s\n"
-"Kas olete nõus?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - automaatne paketivalik süsteemi uuendamiseks.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "paigaldamaks %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - sünteesi kasutamine urpmi andmebaasi asemel.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "rahuldamata %s tõttu"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versioon %s\n"
+"Autoriõigus (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "puuduva %s tõttu"
+msgid "unable to update medium \"%s\"\n"
+msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "konflikti tõttu %s -ga"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "soovimata"
+msgid "unable to create medium \"%s\"\n"
+msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
 
-#: ../urpmi_.c:421
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"do you agree ?"
+"`with' missing for ftp media\n"
 msgstr ""
-"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
 "%s\n"
-"Kas olete nõus?"
+"`with' puudub ftp-andmekandja jaoks\n"
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid (%d MB)"
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
+"%s\n"
+"Puudub <suhteline tee hdlist juurde>\n"
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
 "%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"Järgmiste sõltuvuste paigaldamiseks peate olema administraator:\n"
 "%s\n"
+"võtme --distrib puhul puudub vajadus anda <suhteline tee hdlist juurde>"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "ei leia pakette, katkestan"
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% %s -st tehtud, aega jäänud (olet.) = %s, kiirus = %s"
+msgid "retrieving mirrors at %s ..."
+msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% tehtud, kiirus = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "cookeri distributsiooni uuenduste lisamine ebaõnnestus\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Vajutage Enter, kui see on tehtud..."
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"tundmatu võti '%s'\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Järgmistel pakettidel on vigane signatuur"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - sunnib genereerima hdlist-faile.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Kas jätkata paigaldusega?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - püüab leida ja kasutada sünteesi-\n"
+"                   või hdlist-faili.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (j/E) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - puhastab päistepuhvri kataloogi.\n"
 
-#: ../urpmi_.c:548
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"Paigaldamine ebaõnnestus, mõned failid puudusid:\n"
-"%s\n"
-"Te võiksite ehk uuendada urpmi andmebaasi"
+"  --arch         - kasutab määratud arhitektuuri, vaikimisi on see\n"
+"                   paigaldatud paketi 'mandrake-release' arhitektuur.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Paigaldamine ebaõnnestus"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - kasutab määratud versiooni, vaikimisi on see\n"
+"                   paigaldatud paketi 'mandrake-release' versioon.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "%s jaotamine\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - kasutab määratud url-i peeglite loendi jaoks, vaikimisi\n"
+"                   on see %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - loob automaatselt andmekandja distributsiooni\n"
+"                    osale XXX, kus XXX võib olla main, contrib, updates\n"
+"                    või mis tahes muu seadistatud määratlus ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "kõik on juba paigaldatud"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - loob uuendatava andmekandja.\n"
 
-#: ../urpmq_.c:35
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\n"
 msgstr ""
-"urpmq versioon %s\n"
-"Autoriõigus (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
+"kasutamine: urpmi.addmedia [võti] <nimi> <url> [with <suhteline_tee>]\n"
+"kus <url> on esitatud kujul\n"
+"       file://<asukoht>\n"
+"       ftp://<kasutajanimi>:<parool>@<masin>/<asukoht> with <suhteline tee "
+"hdlist juurde>\n"
+"       ftp://<masin>/<asukoht> with <suhteline tee hdlist juurde>\n"
+"       http://<masin>/<asukoht> with <suhteline tee hdlist juurde>\n"
+"       removable://<tee>\n"
 "\n"
-"kasutamine:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - saadaolevate pakettide loend.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - saadaolevate andmekandjate loend.\n"
+"ja [võti] on üks järgmistest\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --list-nodes   - saadaolevate sõlmede loend, kui kasutatakse võtit --"
-"parallel.\n"
+"puudub eemaldatava kirje nimi\n"
+"(võimalikke %s)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - saadaolevate aliaste loend.\n"
+#: ../urpmi.removemedia:1
+#, 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"
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - kõigi andmekandjate valimine.\n"
+
+#: ../urpmi.removemedia:1
+#, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --headers      - pakettide päised loetakse urpmi andmebaasist "
-"standardväljundisse\n"
-"                   (ainult administraatorile).\n"
+"kasutamine: urpmi.removemedia [-a] <nimi> ...\n"
+"kus <nimi> on eemaldatava andmekandja nimi.\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --sources      - näitab enne allalaadimist kõiki lähtetekstipakette "
-"(ainult administraator).\n"
+"puudub uuendatava kirje nimi\n"
+"(võimalikke %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - laiendab päringut paketi sõltuvustele.\n"
+#: ../urpmi.update:1
+#, 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"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - paketi eemaldamine, kui uuem versioon on juba "
-"paigaldatud.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d             - fail depslist.ordered arvutatakse täielikult.\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c              - täielik väljund eemaldatava(te) paket(t)i(de)ga.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - kõigi mitte-eemaldatavate andmekandjate valimine.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - otsingu kohandamine sellele, mida pakett nõuab.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - ainult uuendus-andmekandja uuendamine.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - näitab koos nimega ka gruppi.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"kasutamine: urpmi.update [võti] <nimi> ...\n"
+"kus <nimi> on uuendatava andmekandja nimi.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - näitab koos nimega ka versiooni ja väljalaset.\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
+
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  päring esitatakse käsureal antud nimede või rpm-failide kohta.\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - näitab koos nimega ka versiooni ja väljalaset.\n"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versioon %s"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - näitab koos nimega ka gruppi.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Autoriõigus (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - otsingu kohandamine sellele, mida pakett nõuab.\n"
 
-#: placeholder.h:20
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c              - täielik väljund eemaldatava(te) paket(t)i(de)ga.\n"
+
+#: ../urpmq:1
+#, c-format
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele."
+"  -u             - paketi eemaldamine, kui uuem versioon on juba "
+"paigaldatud.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "kasutamine: urpmf [võti] <fail>"
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - laiendab päringut paketi sõltuvustele.\n"
 
-#: placeholder.h:22
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --quiet         - välja nime ei näidata (vaikimisi, kui välja ei ole antud "
-"käsureal, "
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    mis ei sobi kokku interaktiivse resiimiga)."
-
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - näitab kõiki välju."
+"  --sources      - näitab enne allalaadimist kõiki lähtetekstipakette "
+"(ainult administraator).\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --name          - näitab välja name: rpm-faili nimi (eeldatavalt, kui "
-"välja ei ole "
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    määratud käsureal, aga ilma paketi nimeta)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - näitab välja group: grupp."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - näitab välja size: suurus."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - näitab välja serial: seerianumber."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - näitab välja summary: kokkuvõte."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - näitab välja description: kirjeldus."
+"  --headers      - pakettide päised loetakse urpmi andmebaasist "
+"standardväljundisse\n"
+"                   (ainult administraatorile).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - näitab välja provides: kõik pakutavad (mitu rida)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - saadaolevate aliaste loend.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - näitab välja requires: kõik nõutavad (mitu rida)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - saadaolevate sõlmede loend, kui kasutatakse võtit --"
+"parallel.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - näitab välja files: kõik failid (mitu rida)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - saadaolevate andmekandjate loend.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr ""
-"  --conflicts     - näitab välja conflicts: kõik konfliktid (mitu rida)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - saadaolevate pakettide loend.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr "  --obsoletes     - näitab välja obsoletes: kõik iganenud (mitu rida)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+"urpmq version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --prereqs       - näitab välja prereqs: kõik eelnõutavad (mitu rida)."
+"urpmq versioon %s\n"
+"Autoriõigus (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "rohkem infot võtmete kohta leiab käsuga urpmf --help"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Paigaldamine ebaõnnestus sõlmel %s"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "täielikku andmekandjate loendit ei leitud"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp ebaõnnestus, võib-olla ei ole sõlm kättesaadav"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput ebaõnnestus, võib-olla ei ole sõlm kättesaadav"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync puudub\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "sõlmel %s"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp ebaõnnestus masinal %s"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh puudub\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "masinal %s ei ole korralikku urpmi versiooni"