changed name of _() function to N()

use of perl_checker to create pot file

57 files changed, 64674 insertions, 56334 deletions

diff --git a/po/Makefile b/po/Makefile
index c8640c1e..aeb00b56 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -10,7 +10,6 @@ PL_FILES = ../_irpm ../urpm.pm ../urpme ../urpmf ../urpmi ../urpmi.addmedia \
 # C-like files to search translatable strings in
 CFILES = ./placeholder.h
 
-PL_CFILES = $(PL_FILES:%=%_.c)
 POFILES = $(shell ls *.po)
 MOFILES = $(POFILES:%.po=%.mo)
 LANGS = $(POFILES:%.po=%)
@@ -26,9 +25,6 @@ all: $(GOALS)
 placeholder.h:
 	./create_placeholder
 
-$(PL_CFILES): %_.c: %
-	./fake_c.pl $< > $@
-
 merge: $(PGOAL).pot
 	@for n in $(POFILES); do \
 		echo "Merging $$n"; \
@@ -36,14 +32,14 @@ merge: $(PGOAL).pot
 		mv -f "$$n"t "$$n"; \
 	done
 
-$(PGOAL).pot: $(PL_CFILES) $(CFILES)
-	xgettext --default-domain=$(PGOAL) -F -n \
-	--add-comments='-PO' --add-comments=' Translator:'\
+$(PGOAL).pot: $(CFILES)
+	xgettext -F -n --add-comments \
 	--keyword=_ --keyword=__ --keyword=N_ --keyword=N \
 	--keyword=gettext \
-	--language=C $(PL_CFILES) $(CFILES)
-	mv -f $(PGOAL).po $(PGOAL).pot
-	@rm -rf $(PL_CFILES)
+	--language=C -o placeholder.pot $(CFILES)
+	perl_checker -q --generate-pot $(PGOAL)_tmp.pot $(PL_FILES)
+	msgcat --use-first placeholder.pot $(PGOAL)_tmp.pot > $@
+	rm -f placeholder.pot $(PGOAL)_tmp.pot
 
 install: all
 	for l in $(LANGS); do \
@@ -52,6 +48,6 @@ install: all
 	done
 
 clean:
-	@rm -rf *~ *.mo $(GOALS) $(PL_CFILES) 
+	@rm -rf *~ *.mo $(GOALS) placeholder.pot $(PGOAL)_tmp.pot 
 
 
diff --git a/po/af.po b/po/af.po
index 7fae1660..cdf7fbe1 100644
--- a/po/af.po
+++ b/po/af.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: Fri May 19 2000 13:02:12+0200\n"
 "Last-Translator: Schalk W. Cronj� <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -14,660 +14,728 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "%s word installeer\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 "Nn"
+
+#: placeholder.h:18
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "urpmf version %s"
 msgstr ""
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Is dit aanvaarbaar?"
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr ""
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "OK"
+#: placeholder.h:20
+msgid ""
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
+msgstr ""
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Kanselleer"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr ""
 
-#: ../_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 "Nn"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_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:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
 msgstr ""
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: ../urpm.pm_.c:226
-#, c-format
-msgid "unable to handle protocol: %s"
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "Installasie het misluk"
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr ""
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: ../urpm.pm_.c:288
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:556
-#, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:572
-#, c-format
+#: placeholder.h:35
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:578
-#, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:585
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:589
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
 msgstr ""
 
-#: ../urpm.pm_.c:598
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: placeholder.h:40
+msgid "no full media list was found"
 msgstr ""
 
-#: ../urpm.pm_.c:600
+#: ../_irpm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpm.pm_.c:614
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm_.c:622
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
+msgid "Cancel"
+msgstr "Kanselleer"
 
-#: ../urpm.pm_.c:628
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpm.pm_.c:651
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
+msgid "Is this OK?"
+msgstr "Is dit aanvaarbaar?"
 
-#: ../urpm.pm_.c:659
+#: ../_irpm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "installing %s\n"
+msgstr "%s word installeer\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "%s is needed by %s"
 msgstr ""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "unable to install package %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to remove package %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
+msgid "unable to access medium \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "urpmi database locked"
+msgstr "RPM-databasisnavraag het misluk\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../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 "medium \"%s\" is not selected"
 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 "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
+msgid "package %s is not found."
 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 "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
+#: ../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)"
 msgstr ""
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:1 ../urpme:1
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Die volgende pakket bevat %s: %s\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "geen pakket het die naam %s nie\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving rpm file [%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 "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "Installasie het misluk"
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: ../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 "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unmounting %s"
+msgstr "%s word installeer\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "%s word installeer\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
 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 "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-#, fuzzy
-msgid "urpmi database locked"
-msgstr "RPM-databasisnavraag het misluk\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: ../urpm.pm:1
+#, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy of [%s] failed"
-msgstr "Installasie het misluk"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "reading rpm files from [%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 "...copying done"
 msgstr ""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+msgid "...copying failed"
+msgstr "Installasie het misluk"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+msgid "copy of [%s] failed"
+msgstr "Installasie het misluk"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm_.c:1798
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "%s word installeer\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving hdlists file..."
+msgstr ""
 
-#: ../urpm.pm_.c:1811
-#, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "%s word installeer\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying hdlists file..."
+msgstr ""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "problem reading hdlist file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: ../urpm.pm_.c:1865
-msgid "unable to register rpm file"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
+#: ../urpm.pm:1
+#, c-format
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1960
-#, fuzzy, c-format
-msgid "no package named %s"
-msgstr "geen pakket het die naam %s nie\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Die volgende pakket bevat %s: %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse \"%s\" in file [%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 "write config file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "unable to write config file [%s]"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../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 "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
+msgid "taking removable device as \"%s\""
 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 "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpm.pm_.c:2457
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Installasie het misluk"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "Installasie het misluk"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Installasie het misluk"
+msgid "syntax error in config file at line %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpme_.c:39
+#: ../urpm.pm:1 ../urpmi: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"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../urpme_.c:64
+#: ../urpm.pm:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpme_.c:83
-#, fuzzy
-msgid "unknown package"
-msgstr "geen pakket het die naam %s nie\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr ""
 
-#: ../urpme_.c:83
-#, fuzzy
-msgid "unknown packages"
-msgstr "geen pakket het die naam %s nie\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "Installasie het misluk"
 
-#: ../urpme_.c:93
+#: ../urpm.pm:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Slegs een van die volgende pakkette word benodig:"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr ""
 
-#: ../urpme_.c:105
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr ""
+
+#: ../urpme:1
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be removed (%d "
@@ -676,771 +744,880 @@ msgstr ""
 "How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
 "d MB)"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, c-format
-msgid ""
-"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"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "geen pakket het die naam %s nie\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "geen pakket het die naam %s nie\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpme:1
+#, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpmf_.c:36
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpmf_.c:39
+#: ../urpme:1 ../urpmi:1
+#, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
-msgstr ""
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\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 ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpme: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 ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
+#: ../urpmf:1 ../urpmq:1
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:115
+#: ../urpmf:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../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 "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:57 ../urpmi.update_.c:66 ../urpmi_.c:92 ../urpmq_.c:58
+#: ../urpmf: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"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../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"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../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 "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:72
+#: ../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 ""
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "Alles is alreeds installeer"
+
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Installasie het misluk"
+
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installasie het misluk"
+
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
 
-#: ../urpmi.addmedia_.c:75
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "%s word installeer\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Die volgende pakket bevat %s: %s\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Druk ENTER wanneer u reg is..."
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Sit asb. die %s getiteld %s in"
+
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
+"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
+"d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../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 ""
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Jammer, swak keuse, probeer weer\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Wat is u keuse (1-%d)"
+
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Slegs een van die volgende pakkette word benodig:"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Slegs een van die volgende pakkette word benodig:"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../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 "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../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 "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpmi_.c:349
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
+#: ../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"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Wat is u keuse (1-%d)"
+msgid "unable to update medium \"%s\"\n"
+msgstr ""
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Jammer, swak keuse, probeer weer\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
 "%s\n"
-"do you agree ?"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: ../urpmi_.c:402
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpmi_.c:407
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi_.c:416
-msgid "unrequested"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:421
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
-"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
-"d MB)"
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+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 ""
 
-#: ../urpmi_.c:507
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Sit asb. die %s getiteld %s in"
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Druk ENTER wanneer u reg is..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Die volgende pakket bevat %s: %s\n"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (J/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"
+"  --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 ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Installasie het misluk"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "%s word installeer\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "Alles is alreeds installeer"
-
-#: ../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"
-"\n"
-"usage:\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
 msgstr ""
 
-#: ../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 ""
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:51
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:53
+#: ../urpmi.removemedia:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Installasie het misluk"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr ""
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Installasie het misluk"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
 #~ msgid "Only superuser is allowed to install local packages"
diff --git a/po/ar.po b/po/ar.po
index 28e74a08..9b8be22a 100644
--- a/po/ar.po
+++ b/po/ar.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: 2001-12-20 23:13GMT+3\n"
 "Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic\n"
@@ -14,1120 +14,1253 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "جاري تثبيت %s\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 "نعمYy"
+
+#. 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 "لاNn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf الإصدار %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "حقوق النشر محفوظة (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 "هذا برنامج حر و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL"
+
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "الإستخدام: urpmf [options] <file>"
+
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
-"التثبيت الآلي للحزم...\n"
-"لقد طلبت تثبيت الحزمة %s\n"
+"  --quiet         - do not print tag name (default if no tag given on command"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "هل أنت موافق؟"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    line, incompatible with interactive mode)."
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "موافق"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - print all tags."
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "الغاء"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
 
-#: ../_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 "لاNn"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    command line but without package name)."
 
-#: ../_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 "نعمYy"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - print tag group: group."
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (ل/ن)"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - print tag size: size."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - print tag serial: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - print tag summary: summary."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   -print tag description: description."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - print tag provides: all provides (multiple lines)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - print tag requires: all requires (multiple lines)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - print tag files: all files (multiple lines)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "جرب urpmf --help لخيارات أكثر"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "لم يتم ايجاد قائمة وسائط كاملة"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: لم يتم ايجاد الأمر\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "أداة تنزيل غير معروفة `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (ل/ن)"
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "بروتكول غير معرف لـ%s"
+msgid "Cancel"
+msgstr "الغاء"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "لم يمكن ايجاد وسيلة لتنزيل الملفات (curl أو wget حاليا)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "موافق"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "تعذر التعامل مع البروتوكول: %s"
+msgid "Is this OK?"
+msgstr "هل أنت موافق؟"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "فشل نسخ: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"التثبيت الآلي للحزم...\n"
+"لقد طلبت تثبيت الحزمة %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget غير موجود\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "جاري تثبيت %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget فشل: تم الخروج بـ%d أو الإشارة %d\n"
+msgid "unable to open rpmdb"
+msgstr "تعذر فتح rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl غير موجود\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "لم يمكن الوصول الى ملف rpm [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "الوسيط \"%s\" يحاول استخدام قائمة مستخدمة مسبقا, تم تجاهل الوسيط"
+msgid "%s conflicts with %s"
+msgstr "%s يتعارض مع %s"
 
-#: ../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 ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "%s is needed by %s"
+msgstr "%s يُحتاج اليه من قبل %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "لم يمكن استخدام الإسم \"%s\" لوسيط غير مسمى لأنه مستخدم بالفعل"
+msgid "unable to install package %s"
+msgstr "تعذر تثبيث الحزمة %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "لم يمكن أخذ الوسيط \"%s\" في الحسبان لأنه لا يوجد ملف القوائم [%s]"
+msgid "unable to remove package %s"
+msgstr "تعذر حذف الحزمة %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "لم يمكن التعرف على الوسيط الخاص بملف hdlist هذا [%s]"
+msgid "Preparing..."
+msgstr "جاري التحضير..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "لم يمكن الوصول الى ملف hdlist لـ\"%s\", تم تجاهل الوسيط"
+msgid "...retrieving failed: %s"
+msgstr "...فشل الإسترجاع: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "لم يمكن الوصول الى ملف قائمة \"%s\", تم تجاهل الوسيط"
+msgid "...retrieving done"
+msgstr "...تم الاسترجاع"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "trying to bypass existing medium \"%s\", avoiding"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "جاري استرجاع ملفات rpm للوسيط \"%s\"..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "لم يمكن ايجاد ملف hdlist لـ \"%s\", تم تجاهل الوسيط"
+msgid "malformed input: [%s]"
+msgstr "ادخال مشوه: [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "لم يمكن ايحاد ملف القوائم لـ\"%s\", تم تجاهل الوسيط"
+msgid "unable to access medium \"%s\""
+msgstr "لم يمكن الوصول الى الوسيط \"%s\""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "incoherent list file for \"%s\", medium ignored"
+msgid "urpmi database locked"
+msgstr "تم اقفال قاعدة بيانات urpmi"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "لم يمكن التفتيش عن ملف قائمة \"%s\", تم تجاهل الوسيط"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "incoherent medium \"%s\" marked removable but not really"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
+msgid "medium \"%s\" is not selected"
+msgstr "الوسيط \"%s\" غير مختار"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "لم يمكن قراءة ملف rpm [%s] من الوسيط \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
+msgid "package %s is not found."
+msgstr "لم يمكن ايجاد الحزمة %s"
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "لم يمكن استرجاع اسم المسار للويط القابل للإزالة \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "الوسيط \"%s\" لا يعرف أي موقع لملفات rpm"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "غير قادر على كتابة ملف الإعدادات [%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:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "اكتب ملف التهيئة [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "هناك حزم متعددة بنفس اسم ملف rpm \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "تعذر تحليل \"%s\" في الملف [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "تعذر تحليل [%s] بشكل صحيح على القيمة \"%s\""
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "جاري اختبار المتعامل المتوازي في الملف [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "الحزم التالية تحتوي على %s: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "تم ايجاد المتعامل المتوازي للعقد: %s"
+msgid "no package named %s"
+msgstr "لا توجد حزمة بالإسم %s"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "جاري استخدام الوسائط المرتبطة للوضع المتوازي: %s"
+msgid "error registering local packages"
+msgstr "خطأ في تسجيل الحزم المحلية"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "لم يمكن الوصول الى ملف rpm [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "تعذر استخدام الخيار المتوازي \"%s\""
+msgid "retrieving rpm file [%s] ..."
+msgstr "جاري استرجاع ملف rpm [%s]..."
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis cannot be used with --media, --update or --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "اسم ملف rpm yير موجود [%s]"
 
-#: ../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 "no entries relocated in depslist"
+msgstr "لم يتم اعادة مداخل في depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "تم اعدة %s مدخل في depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "جاري ازالة تجهيز %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "جاري تجهيز %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "removing %d obsolete headers in cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "found %d headers in cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "جاري اختبار ملف hdlist [%s]"
 
-#: ../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]"
 msgstr "جاري اختبار ملف التخليق [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "مشكلة في قراءة  ملف hdlist للوسيط \"%s\""
+msgid "building hdlist [%s]"
+msgstr "جاري بناء hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr "performing second pass to compute dependencies\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "مشكلة في قراءة ملف التخليق للوسيط \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "تعذر فتح rpmdb"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "الوسيط \"%s\" موجود مسبقا"
+msgid "nothing written in list file for \"%s\""
+msgstr "لا شئ تمت كتايته في ملف القوائم لـ \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "تمت اضافة الوسيط %s"
+msgid "writing list file for medium \"%s\""
+msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "لم يمكن الوصول الى أول وسيط تخزين"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "غير قادر على كتابة ملف القوائم لـ \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "جاري نسخ ملف hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "الملف [%s] مستخدم مسبقا في الوسيط نفسه \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...تم النسخ"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "لم يمكن تحليل ملف hdlist لـ \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...تم النسخ"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%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)"
-msgstr ""
-"لم يمكن الوصول الى وسيط التثبيت الأول (ملف Mandrake/base/hdlists غير موجود)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "فشل استرجاع hdlist (أو ملف تخليق) المصدر"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "جاري استرجاع ملف hdlists..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "جاري اختبار ملف MD5SUM"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...تم الاسترجاع"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "جاري نسخ hdlist (أو ملف تخليق) المصدر لـ\"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...فشل الإسترجاع: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "invalid hdlist description \"%s\" in hdlists file"
+msgid "retrieving description file of \"%s\"..."
+msgstr "جاري استرجاع الوصف الملف \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "جاري محاولة اختيار وسيط غير موجود \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "لم يُعثر على ملفات rpm من [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "تعذر قراءة ملفات rpm من [%s]: %s "
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "جاري اختيار الوسيط المتعدد: %s"
+msgid "reading rpm files from [%s]"
+msgstr "جاري قراءة ملفات rpm من [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "جاري ازالة الوسيط \"%s\""
+msgid "...copying done"
+msgstr "...تم النسخ"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "تم اقفال قاعدة بيانات urpmi"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...تم النسخ"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "لم يمكن الوصول الى الوسيط \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "جاري نسخ قائمة المصدر لـ\"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "فشل نسخ [%s]"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "جاري نسخ hdlist (أو ملف تخليق) المصدر لـ\"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "فشل نسخ [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "جاري اختبار ملف MD5SUM"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "جاري ازالة الوسيط \"%s\""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "جاري نسخ قائمة المصدر لـ\"%s\"..."
+msgid "selecting multiple media: %s"
+msgstr "جاري اختيار الوسيط المتعدد: %s"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "جاري قراءة ملفات rpm من [%s]"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "تعذر قراءة ملفات rpm من [%s]: %s "
+msgid "trying to select inexistent medium \"%s\""
+msgstr "جاري محاولة اختيار وسيط غير موجود \"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "لم يُعثر على ملفات rpm من [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"لم يمكن الوصول الى وسيط التثبيت الأول (ملف Mandrake/base/hdlists غير موجود)"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "جاري استرجاع الوصف الملف \"%s\"..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "invalid hdlist description \"%s\" in hdlists file"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
+msgid "retrieving hdlists file..."
+msgstr "جاري استرجاع ملف hdlists..."
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "فشل استرجاع hdlist (أو ملف تخليق) المصدر"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying hdlists file..."
+msgstr "جاري نسخ ملف hdlist..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
+msgid "unable to access first installation medium"
+msgstr "لم يمكن الوصول الى أول وسيط تخزين"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "الملف [%s] مستخدم مسبقا في الوسيط نفسه \"%s\""
+msgid "added medium %s"
+msgstr "تمت اضافة الوسيط %s"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "لم يمكن تحليل ملف hdlist لـ \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "الوسيط \"%s\" موجود مسبقا"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "غير قادر على كتابة ملف القوائم لـ \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "مشكلة في قراءة  ملف hdlist للوسيط \"%s\""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis cannot be used with --media, --update or --parallel"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "لا شئ تمت كتايته في ملف القوائم لـ \"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "تعذر استخدام الخيار المتوازي \"%s\""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "جاري استخدام الوسائط المرتبطة للوضع المتوازي: %s"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr "تم ايجاد المتعامل المتوازي للعقد: %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "جاري بناء hdlist [%s]"
+msgid "examining parallel handler in file [%s]"
+msgstr "جاري اختبار المتعامل المتوازي في الملف [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "تعذر تحليل \"%s\" في الملف [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "found %d headers in cache"
+msgid "write config file [%s]"
+msgstr "اكتب ملف التهيئة [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "removing %d obsolete headers in cache"
+msgid "unable to write config file [%s]"
+msgstr "غير قادر على كتابة ملف الإعدادات [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "جاري تجهيز %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "لم يمكن استرجاع اسم المسار للويط القابل للإزالة \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "جاري ازالة تجهيز %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "تم اعدة %s مدخل في depslist"
+msgid "taking removable device as \"%s\""
+msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "لم يتم اعادة مداخل في depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "اسم ملف rpm yير موجود [%s]"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "لم يمكن التفتيش عن ملف قائمة \"%s\", تم تجاهل الوسيط"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "جاري استرجاع ملف rpm [%s]..."
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "incoherent list file for \"%s\", medium ignored"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "لم يمكن الوصول الى ملف rpm [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "لم يمكن ايحاد ملف القوائم لـ\"%s\", تم تجاهل الوسيط"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "لم يمكن الوصول الى ملف rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "لم يمكن ايجاد ملف hdlist لـ \"%s\", تم تجاهل الوسيط"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "خطأ في تسجيل الحزم المحلية"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "trying to bypass existing medium \"%s\", avoiding"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "لا توجد حزمة بالإسم %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "لم يمكن الوصول الى ملف قائمة \"%s\", تم تجاهل الوسيط"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "الحزم التالية تحتوي على %s: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "لم يمكن الوصول الى ملف hdlist لـ\"%s\", تم تجاهل الوسيط"
 
-#: ../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\""
-msgstr "هناك حزم متعددة بنفس اسم ملف rpm \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "لم يمكن التعرف على الوسيط الخاص بملف hdlist هذا [%s]"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "تعذر تحليل [%s] بشكل صحيح على القيمة \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "لم يمكن أخذ الوسيط \"%s\" في الحسبان لأنه لا يوجد ملف القوائم [%s]"
 
-#: ../urpm.pm_.c:2171
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "لم يمكن استخدام الإسم \"%s\" لوسيط غير مسمى لأنه مستخدم بالفعل"
+
+#: ../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)"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "الوسيط \"%s\" لا يعرف أي موقع لملفات rpm"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "الوسيط \"%s\" يحاول استخدام قائمة مستخدمة مسبقا, تم تجاهل الوسيط"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "لم يمكن ايجاد الحزمة %s"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "الوسيط \"%s\" يحاول اسنخدام ملف hdlist مستخدم مسبقا, تم تجاهل الوسيط"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "الوسيط \"%s\" غير مختار"
+msgid "syntax error in config file at line %s"
+msgstr "خطأ تركيبي في ملف التهيئة عند السطر %s"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "لم يمكن قراءة ملف rpm [%s] من الوسيط \"%s\""
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completed, speed = %s"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "incoherent medium \"%s\" marked removable but not really"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s completed, ETA = %s, speed = %s"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "ادخال مشوه: [%s]"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "فشل rsync: تم الخروج بـ %d أو الإشارة %d\n"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "جاري استرجاع ملفات rpm للوسيط \"%s\"..."
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "جاري التحضير..."
+msgid "ssh is missing\n"
+msgstr "ssh غير موجود\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "تعذر حذف الحزمة %s"
+msgid "rsync is missing\n"
+msgstr "rsync غير موجود\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "تعذر تثبيث الحزمة %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "فشل curl: تم الخروج بـ %d أو الإشارة %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s يُحتاج اليه من قبل %s"
+msgid "curl is missing\n"
+msgstr "curl غير موجود\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s يتعارض مع %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, ربما تعذر الوصول الى العقدة"
-
-#: ../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, ربما تعذر الوصول الى العقدة"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget فشل: تم الخروج بـ%d أو الإشارة %d\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"
+msgid "wget is missing\n"
+msgstr "wget غير موجود\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 "فشل التثبيت في العقدة %s"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-msgid "Installation is possible"
-msgstr "التثبيت ممكن"
+msgid "copy failed: %s"
+msgstr "فشل نسخ: %s"
 
-#: ../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 في المستضيف %s"
+msgid "unable to handle protocol: %s"
+msgstr "تعذر التعامل مع البروتوكول: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "المستضيف %s لا يحتوي على اصدار جيد من urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "لم يمكن ايجاد وسيلة لتنزيل الملفات (curl أو wget حاليا)\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 الإصدار %s\n"
-"جميع الحقوق محفوظة 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"هذا برنامج حر ومجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"\n"
-"الاستخدام:\n"
+msgid "unknown protocol defined for %s"
+msgstr "بروتكول غير معرف لـ%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         - تطبع رسالة المساعدة هذه.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "أداة تنزيل غير معروفة `%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - قم باختيار حزمة آلياَ في الاختيارات.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "فشلت عملية الإزالة"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "لإرضاء الاعتمادات, ستتم ازالة الحزم التالية (%d ميغابايت)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "جاري التحقق لإزالة الحزم التالية"
 
-#
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - اختر كل الحزم المتفقة مع المعامل.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "لا شئ للإزالة"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: خيار غير معلوم \"-%s\", تحقَّق من طريقة الإستخدام بـ --help\n"
+msgid "removing package %s will break your system"
+msgstr "ازالة الحزمة %s ستتسبب في تعطيل نظامك"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "حزمة غير معروفة "
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "حزم غير معروفة "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "ازالة الحزمة %s ستتسبب في تعطيل نظامك"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: خيار غير معلوم \"-%s\", تحقَّق من طريقة الإستخدام بـ --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "لا شئ للإزالة"
+#
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - اختر كل الحزم المتفقة مع المعامل.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "جاري التحقق لإزالة الحزم التالية"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - distributed urpmi accross machines of alias.\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 "لإرضاء الاعتمادات, ستتم ازالة الحزم التالية (%d ميغابايت)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "فشلت عملية الإزالة"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - قم باختيار حزمة آلياَ في الاختيارات.\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         - تطبع رسالة المساعدة هذه.\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 الإصدار %s\n"
-"جميع الحقوق محفوظة 2000, 2001, 2002 MandrakeSoft.\n"
-"هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"urpme الإصدار %s\n"
+"جميع الحقوق محفوظة 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"هذا برنامج حر ومجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
 "\n"
 "الاستخدام:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"callback is :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - use only the given media, separated by comma.\n"
+#
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - right parenthesis to close group expression.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - left parenthesis to open group expression.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - unary NOT, true if expression is false.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - print all tags.\n"
+"  -o             - binary OR operator, true if one expression is true.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - print tag group: group.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - print tag size: size.\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - print tag size: size.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include perl code directly as perl -e.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - print tag summary: summary.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - print version, release and arch with name.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   -print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignore case distinctions in every pattern.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - print tag provides: all provides (multiple lines).\n"
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - print tag requires: all requires (multiple lines).\n"
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr "  --files         - print tag files: all files (multiple lines).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines).\n"
+"  --requires      - print tag requires: all requires (multiple lines).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines).\n"
+"  --provides      - print tag provides: all provides (multiple lines).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   -print tag description: description.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - print tag summary: summary.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - print tag size: size.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - print tag size: size.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - print tag group: group.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - print all tags.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose mode.\n"
 
-#
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - use only the given media, separated by comma.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - use only update media.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"الاستخدام: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"حيث أن <url> واحد من\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"
+"urpmf الإصدار %s\n"
+"جميع الحقوق محفوظة 2000, 2001, 2002 MandrakeSoft.\n"
+"هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
 "\n"
-"و [options] هم من\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         - use wget to retrieve distant files.\n"
+"الاستخدام:\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         - use curl to retrieve distant files.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limit the download speed.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "التثبيت ممكن"
 
-#: ../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        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "فشل التثبيت"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - اعمل وسيط تحديث.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "جاري توزيع %s\n"
 
-#: ../urpmi.addmedia_.c:64
+#: ../urpmi: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"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --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"
+"لقد فشل التثبيت, بعض الملفات غير موجودة:\n"
+"%s\n"
+"ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid " (y/N) "
+msgstr " (نعم/لا)"
 
-#: ../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"
-msgstr ""
-"  --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"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "هل تريد متابعة التثبيت؟"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - clean headers cache directory.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "اضغط Enter عند الاستعداد..."
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - force generation of hdlist files.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "لم يمكن الحصول على الحزمة المصدرية, جاري الإنهاء"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "تعذر اضافة التحديثات لتوزيعة ccoker\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "لإرضاء الاعتمادات, سيتم تثبيت الحزم التالية )%d ميغابايت("
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
 "%s\n"
-"no need to give <relative path of hdlist> with --distrib"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "لم يمكن تحديث الوسيط \"%s\"\n"
-
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"الحزم التالية يجب أن تحذف لكي تتم ترقيت المتبقي:\n"
 "%s\n"
-"<relative path of hdlist> غير موجود\n"
+"هل أنت موافق ؟"
+
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr "غير مطلوب"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "بسبب التعارض مع %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "بسبب فقدان %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "بسبب عدم ارضاء %s"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "كي يتم تثبيث %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
 "%s\n"
-"`with' غير موجود لوسائط ftp\n"
+"هل أنت موافق ؟"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "لم يمكن عمل الوسيط \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"الاستخدام: urpmi.removemedia [-a] <name> ...\n"
-"حيث أن <name> هو اسم الوسيط المطلوب ازالته.\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "المعذرة, اختيار سئ, حاول مرة أخرى\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - select all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "ما هو اختيارك؟ (1-%d)"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"خيارات غير معروفة '%s'\n"
+msgid "One of the following packages is needed:"
+msgstr "أحد الحزم التالية يُحتاج اليه:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "لا شء للإزالة (استخدم urpmi.addmedia لإضافة وسيط)\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "واحد من هذه الحدم يُحتاج اليه لتثبيت %s:"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"المدخل المطلوب ازالته غير موجود\n"
-"(واحد من %s)\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحزم"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"الاستخدام: urpmi.update [options] <name> ...\n"
-"حيث أن <name> هو اسم الوسيط المطلوب تحديثه.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "جاري استخدام بيئة محددة على %s\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - update only update media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "ماذا يمكن فعله مع ملف rpm تنفيذي عند استخدام المعامل --install-src"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: خيار غير معلوم \"-%s\", تحقَّق من طريقة الإستخدام بـ --help\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضافة وسيط)\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "bad proxy declaration on command line\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"المدخل المطلوب تحديثه غير موجود\n"
-"(واحد من %s)\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر سيتم تثبيتها.\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1 ../urpmq: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"
-msgstr ""
-"urpmi الإصدار %s\n"
-" جميع الحقوق محفوظة 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-" هذا برنامج حر ومجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"\n"
-"الاستخدام:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - وضع تفصيلي.\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - وضع هادئ.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - اختر الحزم آليا لترقية النظام.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s              - الحزمة التالية هي حزمة مصدرية (مثل --src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impose fuzzy search (same as --fuzzy).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "   --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - لا تبحث في المعطيات لإيجاد جزمة.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - السماح بالبحث في المعطيات ليجاد حزمة.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - اختر كل التطابقات على سطر الأوامر.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean     - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - exclude path separated by comma.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - use X interface.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1135,440 +1268,474 @@ msgstr ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 
-#: ../urpmi_.c:98
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - use X interface.\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - exclude path separated by comma.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - اختر كل التطابقات على سطر الأوامر.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - السماح بالبحث في المعطيات ليجاد حزمة.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - لا تبحث في المعطيات لإيجاد جزمة.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impose fuzzy search (same as --fuzzy).\n"
-
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s              - الحزمة التالية هي حزمة مصدرية (مثل --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - وضع هادئ.\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - وضع تفصيلي.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limit the download speed.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر سيتم تثبيتها.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - use curl to retrieve distant files.\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: خيار غير معلوم \"-%s\", تحقَّق من طريقة الإستخدام بـ --help\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - use wget to retrieve distant files.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "ماذا يمكن فعله مع ملف rpm تنفيذي عند استخدام المعامل --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "جاري استخدام بيئة محددة على %s\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - force invocation even if some packages do not exist.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحزم"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean     - keep rpm not used in cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "واحد من هذه الحدم يُحتاج اليه لتثبيت %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - remove rpm from cache before anything else.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "أحد الحزم التالية يُحتاج اليه:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - install only source package (no binaries).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "ما هو اختيارك؟ (1-%d)"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "   --src          - next package is a source package (same as -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "المعذرة, اختيار سئ, حاول مرة أخرى\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - impose fuzzy search (same as -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 ""
-"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
-"%s\n"
-"هل أنت موافق ؟"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - اختر الحزم آليا لترقية النظام.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "كي يتم تثبيث %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "بسبب عدم ارضاء %s"
+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 الإصدار %s\n"
+" جميع الحقوق محفوظة 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+" هذا برنامج حر ومجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"\n"
+"الاستخدام:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "بسبب فقدان %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "لم يمكن تحديث الوسيط \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "بسبب التعارض مع %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "غير مطلوب"
+msgid "unable to create medium \"%s\"\n"
+msgstr "لم يمكن عمل الوسيط \"%s\"\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 ""
-"الحزم التالية يجب أن تحذف لكي تتم ترقيت المتبقي:\n"
 "%s\n"
-"هل أنت موافق ؟"
+"`with' غير موجود لوسائط ftp\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 "لإرضاء الاعتمادات, سيتم تثبيت الحزم التالية )%d ميغابايت("
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
+"%s\n"
+"<relative path of hdlist> غير موجود\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 ""
-"يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
 "%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "لم يمكن الحصول على الحزمة المصدرية, جاري الإنهاء"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "جاري استرجاع ملف rpm [%s]..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "تعذر اضافة التحديثات لتوزيعة ccoker\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"خيارات غير معروفة '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "اضغط Enter عند الاستعداد..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - force generation of hdlist files.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "هل تريد متابعة التثبيت؟"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (نعم/لا)"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - clean headers cache directory.\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 ""
-"لقد فشل التثبيت, بعض الملفات غير موجودة:\n"
-"%s\n"
-"ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "فشل التثبيت"
+#: ../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      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "جاري توزيع %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
+#: ../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  - 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"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "كل شئ مثبت مسبقا"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - اعمل وسيط تحديث.\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 الإصدار %s\n"
-"جميع الحقوق محفوظة 2000, 2001, 2002 MandrakeSoft.\n"
-"هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"الاستخدام: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"حيث أن <url> واحد من\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"
-"الاستخدام:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - list available packages.\n"
+"و [options] هم من\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - list available media.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"المدخل المطلوب ازالته غير موجود\n"
+"(واحد من %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "لا شء للإزالة (استخدم urpmi.addmedia لإضافة وسيط)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - select all media.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"الاستخدام: urpmi.removemedia [-a] <name> ...\n"
+"حيث أن <name> هو اسم الوسيط المطلوب ازالته.\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      - give all source packages before downloading (root only).\n"
+"المدخل المطلوب تحديثه غير موجود\n"
+"(واحد من %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - extend query to package dependencies.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضافة وسيط)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - complete output with package to remove.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverse search to what requires package.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - select all non-removable media.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - تطبع الإصدار و رقمه أيضا مع الإسم أيضاً.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - update only update media.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"الاستخدام: urpmi.update [options] <name> ...\n"
+"حيث أن <name> هو اسم الوسيط المطلوب تحديثه.\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes can only be used with --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf الإصدار %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "حقوق النشر محفوظة (C) 1999,2000,2001,2002 MandrakeSoft"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: خيار غير معروف \"-%s\", تحقق من طريقة الاستخدام بالخيار --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr "هذا برنامج حر و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL"
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "الإستخدام: urpmf [options] <file>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - تطبع الإصدار و رقمه أيضا مع الإسم أيضاً.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverse search to what requires package.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - complete output with package to remove.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    command line but without package name)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - print tag group: group."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - print tag size: size."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - print tag serial: serial."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - print tag summary: summary."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   -print tag description: description."
-
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - print tag provides: all provides (multiple lines)."
-
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - print tag requires: all requires (multiple lines)."
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - extend query to package dependencies.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - list available parallel aliases.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "جرب urpmf --help لخيارات أكثر"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "لم يتم ايجاد قائمة وسائط كاملة"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - list available media.\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "فشل curl: تم الخروج بـ %d أو الإشارة %d\n"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - list available packages.\n"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync غير موجود\n"
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq الإصدار %s\n"
+"جميع الحقوق محفوظة 2000, 2001, 2002 MandrakeSoft.\n"
+"هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"\n"
+"الاستخدام:\n"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "فشل rsync: تم الخروج بـ %d أو الإشارة %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "فشل التثبيت في العقدة %s"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh غير موجود\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "فشل rshp, ربما تعذر الوصول الى العقدة"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "خطأ تركيبي في ملف التهيئة عند السطر %s"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "فشل mput, ربما تعذر الوصول الى العقدة"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "الوسيط \"%s\" يحاول اسنخدام ملف hdlist مستخدم مسبقا, تم تجاهل الوسيط"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "على العقدة %s"
+
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "فشل scp في المستضيف %s"
+
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "المستضيف %s لا يحتوي على اصدار جيد من urpmi"
 
 #~ msgid "ignoring option \"%s\" not used"
 #~ msgstr "ignoring option \"%s\" not used"
@@ -1598,13 +1765,6 @@ msgstr "لم يتم ايجاد قائمة وسائط كاملة"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - تطبع رسالة المساعدة هذه.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr ""
-#~ "urpmq: خيار غير معروف \"-%s\", تحقق من طريقة الاستخدام بالخيار --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr "لم يمكن بناء ملف التخليق للوسيط \"%s\""
 
@@ -1701,9 +1861,6 @@ msgstr "لم يتم ايجاد قائمة وسائط كاملة"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "حقوق النشر محفوظة (C) 1999,2000,2001 MandrakeSoft"
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "bad proxy declaration on command line\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr ""
 #~ "الاستخدام: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
diff --git a/po/az.po b/po/az.po
index 1f28be74..20a4e18a 100644
--- a/po/az.po
+++ b/po/az.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: 2001-11-14 17:06GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -14,616 +14,816 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "%s qurulur\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 "BbYy"
 
-#: ../_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 "XxJjNn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf buraxılışı %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Təlif Haqqı (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 "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
+
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "istifadə qaydası: [urpmf] <fayl>"
+
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
-"Paketlərin öz özünə qurulması...\n"
-"%s paketlərininin qurulmasını istədiniz\n"
+"  --quiet         - təq adlarını göstərmə (təq əmrə verilməyibsə əsasdır"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Oldu mu?"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    sətir, qarşılıqlı moda uyğun deyil)."
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Oldu"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - bütün təqləri göstər."
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Ləğv et"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - təq adını göstər: rpm fayladı (heç təq verilməyibsə"
 
-#: ../_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 "XxJjNn"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    paket adsız əmr sətiri)."
 
-#: ../_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 "BbYy"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (B/x) "
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - təq böyüklüyünü göstər: böyüklük."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - təq serialını göstər: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - təq icmalını göstər: icmal."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - təq izahatını göstər: izahat."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - təq gətirənini göstər: bütün gətirənlər (çoxlu sətir)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - lazımlılar təqini göstər: bütün lazımlılar (çoxlu sətir)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - təq fayllarını göstər: bütün fayllar (çoxlu sətir)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - təq toqquşmalarını göstər: bütün toqquşmalar (çoxlu "
+"sətir)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - təq mütləqlərini göstər: bütün mütləqlər (çoxlu sətir)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - təq ön lazımlılarını göstər: bütün ön lazımlılar (çoxlu "
+"sətir)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "daha təfsilatlı seçənəklər üçün urpmf --help sınayın"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr ""
 
-#: ../_irpm_.c:63
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: əmr tapılmadı\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (B/x) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+msgid "Cancel"
+msgstr "Ləğv et"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Oldu"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Oldu mu?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Paketlərin öz özünə qurulması...\n"
+"%s paketlərininin qurulmasını istədiniz\n"
 
-#: ../urpm.pm_.c:226
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "hdlist inşa edilə bilmir: %s"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "%s qurulur\n"
 
-#: ../urpm.pm_.c:246
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "Qurulum iflas etdi"
+msgid "unable to open rpmdb"
+msgstr "rpm faylı qeyd edilə bilmir"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "rpm faylı [%s] çatıla bilmir"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
 msgstr ""
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "unable to install package %s"
 msgstr ""
-"\"%s\" medyumu onsuz da istifadədə olan bir siyahını işlətməyə cəhd etdi, "
-"medya rədd edildi"
+"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
 
-#: ../urpm.pm_.c:572
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to remove package %s"
 msgstr ""
-"\"%s\" medyası siyahı faylı başqa medya tərəfindən istifadədə olduğu üçün "
-"diqqətə alına bilir"
+"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "Preparing..."
 msgstr ""
-"adsız medya üçün \"%s\" adı işlədilə bilmir, çünkü onsuz da istifadədədir"
 
-#: ../urpm.pm_.c:585
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "\"%s\" medyası [%s] siyahı faylına malik olmadığı üçün alına bilmir"
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "[%s] cəhd edilir"
 
-#: ../urpm.pm_.c:589
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "bu [%s] hdlist faylı medyası tapıla bilmədi"
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving done"
+msgstr "[%s] cəhd edilir"
 
-#: ../urpm.pm_.c:598
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "\"%s\" medyası hdlist faylına çatıla bilmir, medya rədd edildi"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "[%s] cəhd edilir"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
+msgid "malformed input: [%s]"
+msgstr "xətalı giriş: [%s]"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "mövcud medya \"%s\" yan keçilməyə çalışıldı, imtina edirəm"
+msgid "unable to access medium \"%s\""
+msgstr "\"%s\" medyasına çatıla bilmir"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "\"%s\" üçün hdlist faylı tapıla bilmir, medya rədd edildi"
+msgid "urpmi database locked"
+msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "\"%s\" üçün siyahı faylı tapıla bilmir, medya rədd edilir"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" üçün inkoherent siyahı faylı, medya rədd edildi"
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" medyası seçili deyil"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\" faylları siyahısı incələnə bilmir, medya rədd edildi"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
 
-#: ../urpm.pm_.c:690
-#, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr " \"%s\" medyası yaradıla bilmir\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
+msgstr "%s paketi tapılmadı."
 
-#: ../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 "\"%s\" rpm fayl adlı çoxlu fayl tapıldı"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr " \"%s\" medyası yaradıla bilmir\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "[%s] \"%s\" qiymətində düzgün darana bilmədi"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "[%s] quraşdırma faylı yazıla bilmir"
+msgid "The following packages contain %s: %s"
+msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "[%s] quraşdırma faylı yazılır"
+msgid "no package named %s"
+msgstr "%s adlı paket yoxdur"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr "yerli paket qeydiyyat xətası"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to register rpm file"
 msgstr "rpm faylı [%s] çatıla bilmir"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "[%s] hdlist faylı oxunur"
+msgid "retrieving rpm file [%s] ..."
+msgstr "[%s] cəhd edilir"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "hökmsüz rpm fayı adı [%s]"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "[%s] hdlist faylı oxunur"
+msgid "no entries relocated in depslist"
+msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "relocated %s entries in depslist"
+msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
 
-#: ../urpm.pm_.c:784
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr " \"%s\" medyası güncəllənə bilmir\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "%s ayrılır"
 
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "  --all           - bütün təqləri göstər."
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "%s bağlanır"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "ön yaddaşdakı %d mütləq başlıqlar çıxardılır"
 
-#: ../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 "found %d headers in cache"
+msgstr "ön yaddaşda %d başlıq tapıldı"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "[%s] hdlist faylı oxunur"
 
-#: ../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
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "[%s] asılılıqlar siyahısı faylı oxundu"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
+#, c-format
+msgid "building hdlist [%s]"
+msgstr "[%s] hdlist faylı inşa edilir"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
+msgid "reading headers from medium \"%s\""
+msgstr "mövcud olmayan \"%s\" medyası çıxardılmağa çalışılır"
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "rpm faylı qeyd edilə bilmir"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" medyası onsuz da vardır"
+msgid "nothing written in list file for \"%s\""
+msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "added medium %s"
-msgstr "mövcud olmayan \"%s\" medyası çıxardılmağa çalışılır"
+msgid "writing list file for medium \"%s\""
+msgstr "\"%s\" medyası hdlist faylı tapılmadı"
 
-#: ../urpm.pm_.c:933
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "\"%s\" fayl siyahısı yazıla bilmi"
 
-#: ../urpm.pm_.c:937
-#, fuzzy
-msgid "copying hdlists file..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "\"%s\" hdlist faylı alına bilmir"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "\"%s\" medyası hdlist faylı tapılmadı"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
 msgstr "[%s] hdlist faylı oxunur"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying done"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "[%s] cəhd edilir"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving description file of \"%s\"..."
 msgstr "[%s] cəhd edilir"
 
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
-#, fuzzy
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
+#: ../urpm.pm:1
+#, c-format
+msgid "no rpm files found from [%s]"
+msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
 
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "[%s] cəhd edilir"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-#, fuzzy
-msgid "...retrieving done"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
+msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying done"
 msgstr "[%s] cəhd edilir"
 
-#: ../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"
+msgid "...copying failed"
 msgstr "[%s] cəhd edilir"
 
-#: ../urpm.pm_.c:975
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "mövcud olmayan \"%s\" medyası seçilə bilmi"
+msgid "copy of [%s] failed"
+msgstr "[%s] köçürülmə əməliyyatı bacarılmadı"
 
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "mövcud olmayan \"%s\" medyası seçilə bilmi"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "mövcud olmayan \"%s\" medyası çıxardılmağa çalışılır"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "selecting multiple media: %s"
+msgstr "mövcud olmayan \"%s\" medyası seçilə bilmi"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" medyasına çatıla bilmir"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1163
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "mövcud olmayan \"%s\" medyası seçilə bilmi"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "[%s] köçürülmə əməliyyatı bacarılmadı"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "[%s] hdlist faylı oxunur"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving hdlists file..."
+msgstr "[%s] cəhd edilir"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
+msgid "copying hdlists file..."
+msgstr "[%s] hdlist faylı oxunur"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
+msgid "unable to access first installation medium"
+msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
+msgid "added medium %s"
+msgstr "mövcud olmayan \"%s\" medyası çıxardılmağa çalışılır"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" medyası onsuz da vardır"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "[%s] cəhd edilir"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "[%s] cəhd edilir"
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: ../urpm.pm_.c:1432
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "\"%s\" medyası hdlist faylı tapılmadı"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr " \"%s\" medyası güncəllənə bilmir\n"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "[%s] hdlist faylı oxunur"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "[%s] hdlist faylı oxunur"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "rpm faylı [%s] çatıla bilmir"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "\"%s\" hdlist faylı alına bilmir"
+msgid "write config file [%s]"
+msgstr "[%s] quraşdırma faylı yazılır"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "\"%s\" fayl siyahısı yazıla bilmi"
+msgid "unable to write config file [%s]"
+msgstr "[%s] quraşdırma faylı yazıla bilmir"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "\"%s\" medyası hdlist faylı tapılmadı"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr " \"%s\" medyası yaradıla bilmir\n"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "mövcud olmayan \"%s\" medyası çıxardılmağa çalışılır"
+msgid "too many mount points for removable medium \"%s\""
+msgstr " \"%s\" medyası yaradıla bilmir\n"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "[%s] hdlist faylı inşa edilir"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\" faylları siyahısı incələnə bilmir, medya rədd edildi"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" üçün inkoherent siyahı faylı, medya rədd edildi"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "ön yaddaşda %d başlıq tapıldı"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "\"%s\" üçün siyahı faylı tapıla bilmir, medya rədd edilir"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "ön yaddaşdakı %d mütləq başlıqlar çıxardılır"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "\"%s\" üçün hdlist faylı tapıla bilmir, medya rədd edildi"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "%s bağlanır"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "mövcud medya \"%s\" yan keçilməyə çalışıldı, imtina edirəm"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "%s ayrılır"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "\"%s\" medyası hdlist faylına çatıla bilmir, medya rədd edildi"
 
-#: ../urpm.pm_.c:1834
-#, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "bu [%s] hdlist faylı medyası tapıla bilmədi"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "hökmsüz rpm fayı adı [%s]"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "\"%s\" medyası [%s] siyahı faylına malik olmadığı üçün alına bilmir"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "[%s] cəhd edilir"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"adsız medya üçün \"%s\" adı işlədilə bilmir, çünkü onsuz da istifadədədir"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "rpm faylı [%s] çatıla bilmir"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"\"%s\" medyası siyahı faylı başqa medya tərəfindən istifadədə olduğu üçün "
+"diqqətə alına bilir"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "rpm faylı [%s] çatıla bilmir"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"\"%s\" medyumu onsuz da istifadədə olan bir siyahını işlətməyə cəhd etdi, "
+"medya rədd edildi"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "yerli paket qeydiyyat xətası"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"\"%s\" medyası onsuz da istifadədə olan hdlist işlətməyə cəhd etdi, medya "
+"rədd edildi"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "%s adlı paket yoxdur"
+msgid "syntax error in config file at line %s"
+msgstr "quraşdırma faylında %s sətirində sintaksis xətası"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2105 ../urpm.pm_.c:2137 ../urpm.pm_.c:2159
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "\"%s\" rpm fayl adlı çoxlu fayl tapıldı"
-
-#: ../urpm.pm_.c:2147
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "[%s] \"%s\" qiymətində düzgün darana bilmədi"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+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 "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "%s paketi tapılmadı."
+msgid "rsync is missing\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" medyası seçili deyil"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
+msgid "curl is missing\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "xətalı giriş: [%s]"
-
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "[%s] cəhd edilir"
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr ""
-"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
+msgid "copy failed: %s"
+msgstr "Qurulum iflas etdi"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to install package %s"
+msgid "unable to handle protocol: %s"
+msgstr "hdlist inşa edilə bilmir: %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
-"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../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"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "[%s] cəhd edilir"
+
+#: ../urpme:1
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
 
-#: ../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"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
+
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpme:1
 #, c-format
-msgid "on node %s"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Qurulum iflas etdi"
+msgid "unknown package"
+msgstr "%s adlı paket yoxdur"
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "Qurulum iflas etdi"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "%s adlı paket yoxdur"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Qurulum iflas etdi"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
+
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpme_.c:39
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+
+#: ../urpme:1 ../urpmi:1
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - seçililər arasında ən yaxşısını seç.\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         - bu kömək ismarışını çap edər.\n"
+
+#: ../urpme:1
 #, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
@@ -634,950 +834,862 @@ msgid ""
 "usage:\n"
 msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
 
-#: ../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         - bu kömək ismarışını çap edər.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-#, fuzzy
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - seçililər arasında ən yaxşısını seç.\n"
-
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
 
-#: ../urpme_.c:64
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
-"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
-
-#: ../urpme_.c:83
-#, fuzzy
-msgid "unknown package"
-msgstr "%s adlı paket yoxdur"
-
-#: ../urpme_.c:83
-#, fuzzy
-msgid "unknown packages"
-msgstr "%s adlı paket yoxdur"
+"  -u             - daha yaxşı buraxılışı onsuz da qurulu isə paketi çıxart.\n"
 
-#: ../urpme_.c:93
+#: ../urpmf:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr ""
-
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
-
-#: ../urpme_.c:105
+#: ../urpmf:1
 #, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
-
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "[%s] cəhd edilir"
+"  -u             - daha yaxşı buraxılışı onsuz da qurulu isə paketi çıxart.\n"
 
-#: ../urpmf_.c:26
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid ""
-"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 "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
-
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
-
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "   -c            - başlıq ara yaddaşı cərgəsini təmizlə.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - təfsilatlı mod.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --quiet         - təq adlarını göstərmə (təq əmrə verilməyibsə əsasdır"
-
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - bütün təqləri göstər."
+"  --obsoletes     - təq mütləqlərini göstər: bütün mütləqlər (çoxlu sətir)."
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --name          - təq adını göstər: rpm fayladı (heç təq verilməyibsə"
-
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
-
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - təq böyüklüyünü göstər: böyüklük."
-
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - təq böyüklüyünü göstər: böyüklük."
-
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - təq icmalını göstər: icmal."
-
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - təq izahatını göstər: izahat."
+"  --conflicts     - təq toqquşmalarını göstər: bütün toqquşmalar (çoxlu "
+"sətir)."
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
-"  --provides      - təq gətirənini göstər: bütün gətirənlər (çoxlu sətir)."
+"  --files         - təq fayllarını göstər: bütün fayllar (çoxlu sətir)."
 
-#: ../urpmf_.c:47
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 "  --requires      - lazımlılar təqini göstər: bütün lazımlılar (çoxlu sətir)."
 
-#: ../urpmf_.c:48
-#, fuzzy
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --files         - təq fayllarını göstər: bütün fayllar (çoxlu sətir)."
+"  --provides      - təq gətirənini göstər: bütün gətirənlər (çoxlu sətir)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr ""
-"  --conflicts     - təq toqquşmalarını göstər: bütün toqquşmalar (çoxlu "
-"sətir)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - təq izahatını göstər: izahat."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - təq mütləqlərini göstər: bütün mütləqlər (çoxlu sətir)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - təq icmalını göstər: icmal."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - təq böyüklüyünü göstər: böyüklük."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - təq böyüklüyünü göstər: böyüklük."
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "   -c            - başlıq ara yaddaşı cərgəsini təmizlə.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: ../urpmf_.c:54
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -u             - daha yaxşı buraxılışı onsuz da qurulu isə paketi çıxart.\n"
+"  --name          - təq adını göstər: rpm fayladı (heç təq verilməyibsə"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - bütün təqləri göstər."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - təq adlarını göstərmə (təq əmrə verilməyibsə əsasdır"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  -u             - daha yaxşı buraxılışı onsuz da qurulu isə paketi çıxart.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - təfsilatlı mod.\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
 
-#: ../urpmi.addmedia_.c:44
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
-msgstr ""
-"istifadə qaydası: urpmi.addmedia [--update] <ad> <url>\n"
-"burada <url> aşağıdakılardan biridir\n"
-"      file://<cığır>\n"
-"      ftp://<istifadəçi adı>:<parol>@<verici>/<cığır> with <nisbi fayl adı "
-"və ya hdlist>\n"
-"      http://<verici>/<cığır> with <nisbi fayl adı və ya hdlist>\n"
-"      removable_<avadanlıq>://<cığır>\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 ""
-
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+"usage:\n"
+msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "hər şey artıq qurulmuşdur"
 
-#: ../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 ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Qurulum iflas etdi"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Qurulum iflas etdi"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
 
-#: ../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 ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "%s qurulur\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (b/X) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "   -c            - başlıq ara yaddaşı cərgəsini təmizlə.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Qurtardığında enter düyməsinə basın..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "qaynaq paketi alına bilmir, çıxılır"
 
-#: ../urpmi.addmedia_.c:185
-#, fuzzy, c-format
+#: ../urpmi:1
+#, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"<hdlistin nisbi yolu> mövcud deyildir\n"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr " \"%s\" medyası güncəllənə bilmir\n"
+"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
-"%s\n"
-"<hdlistin nisbi yolu> mövcud deyildir\n"
 
-#: ../urpmi.addmedia_.c:205
-#, c-format
+#: ../urpmi:1
+#, fuzzy, 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 ""
-"%s\n"
-"əksik ftp medyası ilə 'with'\n"
+"bə'zi paketlər güncəllənmək üçün çıxardılmalıdırlar, bu da hələlik "
+"dəstəklənmir\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr " \"%s\" medyası yaradıla bilmir\n"
+msgid "unrequested"
+msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
-"istifadə qaydası urpmi.removemedia [-a] <ad> ...\n"
-" <ad> çıxardılacaq medya adı.\n"
-"   -a    medya seç.\n"
-"\n"
-"namə'lum seçənəklər '%s' \n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "   -a            - medya seç.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
 msgstr ""
-"çıxardılacaq bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
+"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
 
-#: ../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 ""
-"çıxardılacaq giriş mövcud deyildir\n"
-"(%s dan (dən) biri)\n"
 
-#: ../urpmi.update_.c:60
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"istifadə qaydası urpmi.removemedia [-a] <ad> ...\n"
-" <ad> çıxardılacaq medya adı.\n"
-"   -a    medya seç.\n"
-"\n"
-"namə'lum seçənəklər '%s' \n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xətalı seçənək, təkrar sınayın\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Seçkiniz? (1-%d)"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - çıxardıla bilməyən medya seç.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
 
-#: ../urpmi.update_.c:73
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Aşağıdakı paketlərin bir dənəsinə %s ehtiyac hiss edir:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
 msgstr ""
-"güncəllənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia "
-"işlədin)\n"
+"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"güncəllənəcək giriş mövcud deyildir\n"
-"(%s dan (dən) biri)\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1
 #, fuzzy, 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"
-msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
+msgid "Unable to create directory [%s] for bug report"
+msgstr "[%s] \"%s\" qiymətində düzgün darana bilmədi"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-#, fuzzy
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - sistemi güncəlləmək üçün paketləri öz-özünə seç.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:45
-#, fuzzy
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --all           - bütün təqləri göstər."
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-#, fuzzy
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - təfsilatlı mod.\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - bütün təqləri göstər."
 
-#: ../urpmi_.c:82
-#, fuzzy
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "                    paket adsız əmr sətiri)."
+
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  --all           - bütün təqləri göstər."
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
+
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - X ara üzünü işlət.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - X ara üzünü işlət.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-#, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-#, fuzzy
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  --all           - bütün təqləri göstər."
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-#, fuzzy
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "                    paket adsız əmr sətiri)."
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
 
-#: ../urpmi_.c:112
-#, fuzzy
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --all           - bütün təqləri göstər."
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - təfsilatlı mod.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "[%s] \"%s\" qiymətində düzgün darana bilmədi"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - sistemi güncəlləmək üçün paketləri öz-özünə seç.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr ""
-"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
+#: ../urpmi:1
+#, fuzzy, 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"
+msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
 
-#: ../urpmi_.c:349
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Aşağıdakı paketlərin bir dənəsinə %s ehtiyac hiss edir:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
+msgid "unable to update medium \"%s\"\n"
+msgstr " \"%s\" medyası güncəllənə bilmir\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Seçkiniz? (1-%d)"
+msgid "unable to create medium \"%s\"\n"
+msgstr " \"%s\" medyası yaradıla bilmir\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xətalı seçənək, təkrar sınayın\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
+msgstr ""
+"%s\n"
+"əksik ftp medyası ilə 'with'\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
 "%s\n"
-"do you agree ?"
+"<relative path of hdlist> missing\n"
 msgstr ""
+"%s\n"
+"<hdlistin nisbi yolu> mövcud deyildir\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "in order to install %s"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
+"%s\n"
+"<hdlistin nisbi yolu> mövcud deyildir\n"
 
-#: ../urpmi_.c:407
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "[%s] cəhd edilir"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: ../urpmi_.c:421
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
-msgstr ""
-"bə'zi paketlər güncəllənmək üçün çıxardılmalıdırlar, bu da hələlik "
-"dəstəklənmir\n"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr ""
-"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "   -c            - başlıq ara yaddaşı cərgəsini təmizlə.\n"
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "qaynaq paketi alına bilmir, çıxılır"
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+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 ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Qurtardığında enter düyməsinə basın..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+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 ""
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (b/X) "
-
-#: ../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"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Qurulum iflas etdi"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "%s qurulur\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "hər şey artıq qurulmuşdur"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: ../urpmq_.c:35
+#: ../urpmi.addmedia:1
 #, fuzzy, 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"
-msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
-
-#: ../urpmq_.c:46
-#, fuzzy
-msgid "  --list         - list available packages.\n"
-msgstr "  --all           - bütün təqləri göstər."
+"and [options] are from\n"
+msgstr ""
+"istifadə qaydası: urpmi.addmedia [--update] <ad> <url>\n"
+"burada <url> aşağıdakılardan biridir\n"
+"      file://<cığır>\n"
+"      ftp://<istifadəçi adı>:<parol>@<verici>/<cığır> with <nisbi fayl adı "
+"və ya hdlist>\n"
+"      http://<verici>/<cığır> with <nisbi fayl adı və ya hdlist>\n"
+"      removable_<avadanlıq>://<cığır>\n"
 
-#: ../urpmq_.c:47
-#, fuzzy
-msgid "  --list-media   - list available media.\n"
-msgstr "  --all           - bütün təqləri göstər."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"çıxardılacaq giriş mövcud deyildir\n"
+"(%s dan (dən) biri)\n"
 
-#: ../urpmq_.c:48
-#, fuzzy
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --all           - bütün təqləri göstər."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"çıxardılacaq bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
 
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --all           - bütün təqləri göstər."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "   -a            - medya seç.\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, fuzzy, 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 ""
+"istifadə qaydası urpmi.removemedia [-a] <ad> ...\n"
+" <ad> çıxardılacaq medya adı.\n"
+"   -a    medya seç.\n"
+"\n"
+"namə'lum seçənəklər '%s' \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      - endirmədən əvvəl bütün mənbə paketini ver (təkcə ali "
-"istifadəçi).\n"
-
-#: ../urpmq_.c:63
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    paket adsız əmr sətiri)."
+"güncəllənəcək giriş mövcud deyildir\n"
+"(%s dan (dən) biri)\n"
 
-#: ../urpmq_.c:64
-#, fuzzy
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"  -u             - daha yaxşı buraxılışı onsuz da qurulu isə paketi çıxart.\n"
-
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    paket adsız əmr sətiri)."
+"güncəllənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia "
+"işlədin)\n"
 
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: ../urpmq_.c:70
-#, fuzzy
-msgid "  -g             - print groups with name also.\n"
-msgstr "  --group         - təq qrupunu göstər: qrup."
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - çıxardıla bilməyən medya seç.\n"
 
-#: ../urpmq_.c:71
-#, fuzzy
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - adla birlikdə buraxılış və yayını da çap et.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"istifadə qaydası urpmi.removemedia [-a] <ad> ...\n"
+" <ad> çıxardılacaq medya adı.\n"
+"   -a    medya seç.\n"
+"\n"
+"namə'lum seçənəklər '%s' \n"
 
-#: ../urpmq_.c:174
-#, fuzzy
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - bütün təqləri göstər."
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf buraxılışı %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Təlif Haqqı (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "istifadə qaydası: [urpmf] <fayl>"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - adla birlikdə buraxılış və yayını da çap et.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - təq adlarını göstərmə (təq əmrə verilməyibsə əsasdır"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    sətir, qarşılıqlı moda uyğun deyil)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  --group         - təq qrupunu göstər: qrup."
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - bütün təqləri göstər."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    paket adsız əmr sətiri)."
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - təq adını göstər: rpm fayladı (heç təq verilməyibsə"
+"  -u             - daha yaxşı buraxılışı onsuz da qurulu isə paketi çıxart.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr "                    paket adsız əmr sətiri)."
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - təq qrupunu göstər: qrup."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - endirmədən əvvəl bütün mənbə paketini ver (təkcə ali "
+"istifadəçi).\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - təq böyüklüyünü göstər: böyüklük."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - təq serialını göstər: serial."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - təq icmalını göstər: icmal."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - təq izahatını göstər: izahat."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr ""
-"  --provides      - təq gətirənini göstər: bütün gətirənlər (çoxlu sətir)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --all           - bütün təqləri göstər."
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr ""
-"  --requires      - lazımlılar təqini göstər: bütün lazımlılar (çoxlu sətir)."
+#: ../urpmq:1
+#, fuzzy, 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"
+"\n"
+"usage:\n"
+msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --files         - təq fayllarını göstər: bütün fayllar (çoxlu sətir)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Qurulum iflas etdi"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
-"  --conflicts     - təq toqquşmalarını göstər: bütün toqquşmalar (çoxlu "
-"sətir)."
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
-"  --obsoletes     - təq mütləqlərini göstər: bütün mütləqlər (çoxlu sətir)."
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
-"  --prereqs       - təq ön lazımlılarını göstər: bütün ön lazımlılar (çoxlu "
-"sətir)."
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "daha təfsilatlı seçənəklər üçün urpmf --help sınayın"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Qurulum iflas etdi"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "quraşdırma faylında %s sətirində sintaksis xətası"
-
-#, fuzzy
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "\"%s\" medyası onsuz da istifadədə olan hdlist işlətməyə cəhd etdi, medya "
-#~ "rədd edildi"
-
 #~ msgid ""
 #~ "  -c             - choose complete method for resolving requires "
 #~ "closure.\n"
@@ -1589,13 +1701,6 @@ msgstr ""
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - yardım ismarışı çap edilir.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr ""
-#~ "urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi qurulmayıb"
 
diff --git a/po/bg.po b/po/bg.po
index e5f312b9..540bc941 100644
--- a/po/bg.po
+++ b/po/bg.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: 2000-01-30 17:59+0100\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team:  Bulgarian\n"
@@ -13,1658 +13,1781 @@ msgstr ""
 "Content-Type: text/plain; charset=windows-1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "����������� %s\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 "��Yy"
 
-#: ../_irpm_.c:33
-#, c-format
+#. 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 "��Nn"
+
+#: placeholder.h:18
+#, fuzzy, c-format
+msgid "urpmf version %s"
+msgstr "urpmf ������ %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr ""
+
+#: 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 ""
-"����������� ���������� �� ������ ...\n"
-"��� ��������� ���������� �� ����� %s\n"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "���� ����� �� �"
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "����� �� ����������: urpmf [<����>]"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "�����"
+#: placeholder.h:22
+#, fuzzy
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - �� ��������� ����� �� ���� (�� ������������ ��� �� � "
+"������� ��� �� ���������"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "�����"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    ���, ����������� � ������������� ����� �� ������)."
 
-#: ../_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 "��Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - ��������� ������ ������."
 
-#: ../_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 "��Yy"
+#: placeholder.h:25
+#, fuzzy
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - ��������� ����� �� ����: ����� �� rpm ����� (�� "
+"������������ ��� �� � ������� ���"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (�/�) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    �������� ��� �� ��� ��� �� �����)."
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ��������� �� � ��������\n"
+# msgstr "  --group         - ��������� ������� ������: group."
+#: placeholder.h:27
+#, fuzzy
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - ��������� ������� �� ������: group."
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - ��������� ������� �� ����: size."
+
+#: placeholder.h:29
+#, fuzzy
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --size          - ��������� ������� �� ����: size."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - ��������� ������ �� ����: summary."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - ��������� �������� �� ����: description."
+
+#: placeholder.h:32
+#, fuzzy
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
+"  --requires      - ��������� ���������� �� ����: ������ ���������� "
+"(��������� ������)."
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
+#: placeholder.h:33
+#, fuzzy
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
+"  --requires      - ��������� ���������� �� ����: ������ ���������� "
+"(��������� ������)."
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: placeholder.h:34
+#, fuzzy
+msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
+"  --requires      - ��������� ���������� �� ����: ������ ���������� "
+"(��������� ������)."
 
-#: ../urpm.pm_.c:226
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "���������� �� �� ������ �������� [%s]"
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - ��������� ����������� �� ����: ������ ��������� "
+"(��������� ������)."
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...���������� �� �������"
+#: placeholder.h:36
+#, fuzzy
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --conflicts     - ��������� ����������� �� ����: ������ ��������� "
+"(��������� ������)."
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: placeholder.h:37
+#, fuzzy
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
+"  --requires      - ��������� ���������� �� ����: ������ ���������� "
+"(��������� ������)."
 
-#: ../urpm.pm_.c:288
-#, fuzzy, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ���������: ����� � %d ��� ������ %d\n"
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "urpmf --help �� ������ �����"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: placeholder.h:40
+msgid "no full media list was found"
 msgstr ""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-# "list" is translated in the meaning of "list file"
-#: ../urpm.pm_.c:556
-#, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"���������� \"%s\" ����� ���� �� ������ ���� ��������� ����, ���������� � "
-"���������"
+#: ../_irpm:1
+#, c-format
+msgid "%s: command not found\n"
+msgstr "%s: ��������� �� � ��������\n"
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:572
-#, fuzzy, c-format
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid " (Y/n) "
+msgstr " (�/�) "
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Cancel"
+msgstr "�����"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "�����"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "���� ����� �� �"
+
+#: ../_irpm:1
+#, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"���������� ������� �� ���������� \"%s\" ��� ���� ���� ����� ���� �� ������ "
-"�� ���� ���������"
+"����������� ���������� �� ������ ...\n"
+"��� ��������� ���������� �� ����� %s\n"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "����������� %s\n"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "unable to open rpmdb"
+msgstr "���������� ���������������� �� ���������� \"%s\"\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
 msgstr ""
-"���������� ������������ �� ����� \"%s\" �� ������������ ��������� ������ �� "
-"� ���� � ��������"
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:585
-#, fuzzy, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s conflicts with %s"
 msgstr ""
-"���������� ��������� ������� �� ���������� \"%s\" ��� ���� ���� ����� [%s] "
-"�� ����������"
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "���������� ������������ �� ���������� � ���� hdlist ���� [%s]"
+msgid "unable to install package %s"
+msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "���������� ������� �� hdlist ����� �� \"%s\", ���������� � ���������"
+msgid "unable to remove package %s"
+msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "Preparing..."
+msgstr ""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "���������� ������� �� ���� ����� �� \"%s\", ���������� � ���������"
+msgid "...retrieving failed: %s"
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, c-format
+msgid "...retrieving done"
+msgstr ""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "���� �� ������������� �� ������������� ��������� \"%s\", ���������"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "malformed input: [%s]"
+msgstr "��� ����: [%s]"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "���������� ���������� �� hdlist ���� �� \"%s\", ���������� � ���������"
+msgid "unable to access medium \"%s\""
+msgstr "���������� ������� �� ���������� \"%s\""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "���������� �� �� ������ ���� ���� �� \"%s\", ���������� � ���������"
+msgid "urpmi database locked"
+msgstr "��������,rpm ���� �����,���������\n"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "���������������� ���� ���� �� \"%s\", ���������� � ���������"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"����������������� ��������� \"%s\" � �������� ���� ��������� �� � "
+"�������������� �� �"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "���������� �������� �� ���� ����� �� \"%s\", ���������� � ���������"
+msgid "medium \"%s\" is not selected"
+msgstr "���������� \"%s\" �� � ������"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "������ ����� ����� �� ��������� �� ��������� ��������� \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "package %s is not found."
+msgstr "������� %s �� � �������."
+
+#: ../urpm.pm:1
+#, c-format
+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:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "���������� ��������������� �� ���� �� ��������� ��������� \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "���� ������ �������� %s: %s"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "���� ����� ������� %s\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "���������� �� �� ������ ��������������� ���� [%s]"
+msgid "error registering local packages"
+msgstr ""
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "write config file [%s]"
+msgid "unable to register rpm file"
 msgstr "���������� �� �� ������ ��������������� ���� [%s]"
 
-#: ../urpm.pm_.c:755
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "���������� �� �� ������ ��������������� ���� [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
 
-#: ../urpm.pm_.c:766
-#, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "������� ������ ����� [%s]"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "���������� ���������������� �� ���������� \"%s\"\n"
+msgid "unmounting %s"
+msgstr "��������� �� %s\n"
 
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "  --all           - ��������� ������ ������."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "��������� �� %s\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
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "������� ������ ����� [%s]"
+msgid "removing %d obsolete headers in cache"
+msgstr "�������� %d ������ � ����"
 
-#: ../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 "found %d headers in cache"
+msgstr "�������� %d ������ � ����"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "examining synthesis file [%s]"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "������ hdlist ������ ���� �� ���������  \"%s\""
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "������ hdlist ������ ���� �� ���������  \"%s\""
+msgid "examining hdlist file [%s]"
+msgstr "������� ������ ����� [%s]"
 
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "examining synthesis file [%s]"
 msgstr "������ hdlist ������ ���� �� ���������  \"%s\""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "���������� ���������������� �� ���������� \"%s\"\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "building hdlist [%s]"
+msgstr ""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "medium \"%s\" already exists"
-msgstr "���������� \"%s\" ���� ����������"
+msgid "reading headers from medium \"%s\""
+msgstr "���������� �� ���������� \"%s\""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "added medium %s"
-msgstr "������� ���������� %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "������ hdlist ������ ���� �� ���������  \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr "���� �� � �������� � ���� ����� �� \"%s\""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:933
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "���������� ������� �� ���������� �� ������������ ����������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "�� � ������� hdlist ���� �� ���������� \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "������������ �� �� ������ ���� ���� �� \"%s\""
 
-#: ../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 "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...���������� �� �������"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "���������� �� �� ������ hdlist ����� �� \"%s\""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
-#, fuzzy
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"���������� ������� �� ���������� �� ������������ ���������� (�� � ������� "
-"����� Mandrake/base/hdlists)"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "�� � ������� hdlist ���� �� ���������� \"%s\""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+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 "examining MD5SUM file"
 msgstr ""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../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"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
 
-#: ../urpm.pm_.c:975
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "��������� hdlist �������� \"%s\" � hdlists �����"
-
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "���� �� ����� �� ������������� ��������� \"%s\""
-
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "\"%s\""
-msgstr ""
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "���� �� ����� �� ��������� ����������: %s"
+msgid "retrieving description file of \"%s\"..."
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "���������� �� ���������� \"%s\""
-
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-#, fuzzy
-msgid "urpmi database locked"
-msgstr "��������,rpm ���� �����,���������\n"
+msgid "no rpm files found from [%s]"
+msgstr "������� ������ ����� [%s]"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "���������� ������� �� ���������� \"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "���� �� � �������� � ���� ����� �� \"%s\""
+msgid "reading rpm files from [%s]"
+msgstr "������� ������ ����� [%s]"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy of [%s] failed"
+msgid "...copying failed"
 msgstr "...���������� �� �������"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr ""
-
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "������� ������ ����� [%s]"
+msgid "copy of [%s] failed"
+msgstr "...���������� �� �������"
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpm.pm_.c:1267
-#, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no rpm files found from [%s]"
-msgstr "������� ������ ����� [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "���� �� � �������� � ���� ����� �� \"%s\""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+msgid "removing medium \"%s\""
+msgstr "���������� �� ���������� \"%s\""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "���� �� ����� �� ��������� ����������: %s"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "�� � ������� hdlist ���� �� ���������� \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "���� �� ����� �� ������������� ��������� \"%s\""
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
-#, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
+"���������� ������� �� ���������� �� ������������ ���������� (�� � ������� "
+"����� Mandrake/base/hdlists)"
 
-#: ../urpm.pm_.c:1480
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "���������� �� �� ������ hdlist ����� �� \"%s\""
-
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "������������ �� �� ������ ���� ���� �� \"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "��������� hdlist �������� \"%s\" � hdlists �����"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "�� � ������� hdlist ���� �� ���������� \"%s\""
+msgid "retrieving hdlists file..."
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "���� �� � �������� � ���� ����� �� \"%s\""
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+msgid "copying hdlists file..."
 msgstr ""
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "���������� �� ���������� \"%s\""
-
-#: ../urpm.pm_.c:1597
-#, c-format
-msgid "building hdlist [%s]"
-msgstr ""
+msgid "unable to access first installation medium"
+msgstr "���������� ������� �� ���������� �� ������������ ����������"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "������ hdlist ������ ���� �� ���������  \"%s\""
+msgid "added medium %s"
+msgstr "������� ���������� %s"
 
-#: ../urpm.pm_.c:1647
-#, c-format
-msgid "found %d headers in cache"
-msgstr "�������� %d ������ � ����"
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" already exists"
+msgstr "���������� \"%s\" ���� ����������"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "�������� %d ������ � ����"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "������ hdlist ������ ���� �� ���������  \"%s\""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "mounting %s"
-msgstr "��������� �� %s\n"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "  --all           - ��������� ������ ������."
 
-#: ../urpm.pm_.c:1811
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "��������� �� %s\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "���������� ���������������� �� ���������� \"%s\"\n"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
+#, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "������� ������ ����� [%s]"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "���������� �� �� ������ ��������������� ���� [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "write config file [%s]"
+msgstr "���������� �� �� ������ ��������������� ���� [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr "���������� �� �� ������ ��������������� ���� [%s]"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "���������� ��������������� �� ���� �� ��������� ��������� \"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "���������� �� �� ������ ��������������� ���� [%s]"
-
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1960
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no package named %s"
-msgstr "���� ����� ������� %s\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "������ ����� ����� �� ��������� �� ��������� ��������� \"%s\""
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "���� ������ �������� %s: %s"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "���������� �������� �� ���� ����� �� \"%s\", ���������� � ���������"
 
-#: ../urpm.pm_.c:2105 ../urpm.pm_.c:2137 ../urpm.pm_.c:2159
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr ""
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "���������������� ���� ���� �� \"%s\", ���������� � ���������"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "���������� �� �� ������ ���� ���� �� \"%s\", ���������� � ���������"
 
-#: ../urpm.pm_.c:2171
-#, c-format
-msgid ""
-"medium \"%s\" use an invalid list file (mirror is problably not up-to-date, "
-"trying to use alternate method)"
-msgstr ""
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "���������� ���������� �� hdlist ���� �� \"%s\", ���������� � ���������"
 
-#: ../urpm.pm_.c:2174
-#, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "���� �� ������������� �� ������������� ��������� \"%s\", ���������"
 
-#: ../urpm.pm_.c:2183
-#, c-format
-msgid "package %s is not found."
-msgstr "������� %s �� � �������."
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "���������� ������� �� ���� ����� �� \"%s\", ���������� � ���������"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "���������� \"%s\" �� � ������"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "���������� ������� �� hdlist ����� �� \"%s\", ���������� � ���������"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "���������� ������������ �� ���������� � ���� hdlist ���� [%s]"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
-"����������������� ��������� \"%s\" � �������� ���� ��������� �� � "
-"�������������� �� �"
+"���������� ��������� ������� �� ���������� \"%s\" ��� ���� ���� ����� [%s] "
+"�� ����������"
 
-#: ../urpm.pm_.c:2337
-#, c-format
-msgid "malformed input: [%s]"
-msgstr "��� ����: [%s]"
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"���������� ������������ �� ����� \"%s\" �� ������������ ��������� ������ �� "
+"� ���� � ��������"
 
 # Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
 # in this case must be "���������"
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"���������� ������� �� ���������� \"%s\" ��� ���� ���� ����� ���� �� ������ "
+"�� ���� ���������"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+# "list" is translated in the meaning of "list file"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
+"���������� \"%s\" ����� ���� �� ������ ���� ��������� ����, ���������� � "
+"���������"
 
-#: ../urpm.pm_.c:2448
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"���������� \"%s\" ����� ���� �� ������ ���� ��������� hdlist, ���������� � "
+"���������"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
+msgid "syntax error in config file at line %s"
+msgstr "���������� �� �� ������ ��������������� ���� [%s]"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "wget ���������: ����� � %d ��� ������ %d\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "wget ���������: ����� � %d ��� ������ %d\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "������������ ���������"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget ���������: ����� � %d ��� ������ %d\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "������������ ���������"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr ""
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "������������ ���������"
+msgid "copy failed: %s"
+msgstr "...���������� �� �������"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to handle protocol: %s"
+msgstr "���������� �� �� ������ �������� [%s]"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../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"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-#, fuzzy
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - ����������� �������� �� ����� ����� �� ������.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "...���������� �� �������"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"�� �� �� ������� �������������,���� ������ �� ����� ����������� (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "���� �� ���� ������ � ���������:"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - �������� �� ������ ���������� �� ��������� ���.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr ""
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "���������� �����(�)"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "���������� �����(�)"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - �������� �� ������ ���������� �� ��������� ���.\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "���� �� ���� ������ � ���������:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
 
-#: ../urpme_.c:105
-#, fuzzy, c-format
+#: ../urpme:1 ../urpmi:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"�� �� �� ������� �������������,���� ������ �� ����� ����������� (%d MB)"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "...���������� �� �������"
+#: ../urpme:1 ../urpmi:1
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - ����������� �������� �� ����� ����� �� ������.\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 ""
 
-#: ../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_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --update       - ��������� �� ������ ���������.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - �������� �� ������ ���������� �� ��������� ���.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - �������� �� ������ ���������� �� ��������� ���.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
+"  -u             - �������� ������ ��� ���� � ����������� �� ����� ������.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - �� ��������� ����� �� ���� (�� ������������ ��� �� � "
-"������� ��� �� ���������"
-
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - ��������� ������ ������."
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - ��������� ����� �� ����: ����� �� rpm ����� (�� "
-"������������ ��� �� � ������� ���"
-
-# msgstr "  --group         - ��������� ������� ������: group."
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - ��������� ������� �� ������: group."
-
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - ��������� ������� �� ����: size."
+"  -u             - �������� ������ ��� ���� � ����������� �� ����� ������.\n"
 
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - ��������� ������� �� ����: size."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - ���������� �� ����� ��� ������������.\n"
 
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - ��������� ������ �� ����: summary."
+#: ../urpmf:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - ��������� ������,���������� � ����������� � ���.\n"
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - ��������� �������� �� ����: description."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - �������� �� ������������ �� hdlist �������.\n"
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --requires      - ��������� ���������� �� ����: ������ ���������� "
+"  --conflicts     - ��������� ����������� �� ����: ������ ��������� "
 "(��������� ������)."
 
-#: ../urpmf_.c:47
-#, fuzzy
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - ��������� ���������� �� ����: ������ ���������� "
+"  --conflicts     - ��������� ����������� �� ����: ������ ��������� "
 "(��������� ������)."
 
-#: ../urpmf_.c:48
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 "  --requires      - ��������� ���������� �� ����: ������ ���������� "
 "(��������� ������)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - ��������� ����������� �� ����: ������ ��������� "
+"  --requires      - ��������� ���������� �� ����: ������ ���������� "
 "(��������� ������)."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --conflicts     - ��������� ����������� �� ����: ������ ��������� "
+"  --requires      - ��������� ���������� �� ����: ������ ���������� "
 "(��������� ������)."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - �������� �� ������������ �� hdlist �������.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - ��������� �������� �� ����: description."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-#, fuzzy
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - ��������� ������,���������� � ����������� � ���.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - ��������� ������ �� ����: summary."
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - ���������� �� ����� ��� ������������.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - ��������� ������� �� ����: size."
 
-#: ../urpmf_.c:54
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - ��������� ������� �� ����: size."
+
+# msgstr "  --group         - ��������� ������� ������: group."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - ��������� ������� �� ������: group."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -u             - �������� ������ ��� ���� � ����������� �� ����� ������.\n"
+"  --name          - ��������� ����� �� ����: ����� �� rpm ����� (�� "
+"������������ ��� �� � ������� ���"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - ��������� ������ ������."
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - �� ��������� ����� �� ���� (�� ������������ ��� �� � "
+"������� ��� �� ���������"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
-"  -u             - �������� ������ ��� ���� � ����������� �� ����� ������.\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - �������� �� ������ ���������� �� ��������� ���.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - �������� �� ������ ���������� �� ��������� ���.\n"
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --update       - ��������� �� ������ ���������.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "������ � ����������� ����"
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "������������ ���������"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "������������ ���������"
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "���� �� ����������� ���� ��-����� (--force)? (�/�) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "���� �� ����������� ��� �������� �� �����������? (�/�) "
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "����������� %s\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpmi.addmedia_.c:61
-#, fuzzy
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - ��������� �� ������ ���������.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (�/�) "
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
 msgstr ""
-"  --distrib      - ����������� ��������� �� ������ ����� �� ������������� "
-"���������.\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"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "���� ������ �������� %s: %s"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "��������� Enter,������ ��� ������..."
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "���� ������� \"%s\" � ���������� [%s]"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
+"�� �� �� ������� �������������,���� ������ �� ����� ����������� (%d MB)"
 
-#: ../urpmi.addmedia_.c:69
+#: ../urpmi: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"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:72
+#: ../urpmi:1
+#, fuzzy, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
+"����� ������ ������ �� ����� ���������� �� �� �� ����������, ���� �� �� "
+"�������� ��� ���\n"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - ���������� �� ����� ��� ������������.\n"
-
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
 msgstr ""
-"  -h             - ������ �� ������� � ������� ������ or hdlist ����.\n"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - �������� �� ������������ �� hdlist �������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr ""
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "���������� ���������������� �� ���������� \"%s\"\n"
+msgid "in order to install %s"
+msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
-msgstr ""
+msgid "Sorry, bad choice, try again\n"
+msgstr "���������,��� �����, �������� ������\n"
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "����� � ������ �����? (1-%d) "
+
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "���� �� ���� ������ � ���������:"
+
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "���������� ����������� �� ���������� \"%s\"\n"
+msgid "One of the following packages is needed to install %s:"
+msgstr "���� �� ���� ������ � ��������� �� ���������� �� %s:"
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpmi.removemedia_.c:34
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"��������: urpmi.removemedia [-a] <���> ...\n"
-"������ <���> � ��� �� ��������� �� ����������.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "���� �� ���������� (������� urpmi.addmedia �� �������� �� ���������)\n"
-
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpmi.update_.c:60
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"usage: urpmi.update [options] <name> ...\n"
-"������ <���> � ��� �� ��������� �� ������.\n"
 
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - ��������� �� ������ ���������.\n"
-
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "���� �� ������� (������� urpmi.addmedia �� �������� �� ���������)\n"
-
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../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 "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-#, fuzzy
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
-"  --auto-select  - ����������� ������ ������ �� ������� �� ���������.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - �������� �� ������ ���������� �� ��������� ���.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi_.c:103
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-#, fuzzy
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - �������� �� ������ ���������� �� ��������� ���.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
+"  --auto-select  - ����������� ������ ������ �� ������� �� ���������.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+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_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
-
-#: ../urpmi_.c:349
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "���� �� ���� ������ � ��������� �� ���������� �� %s:"
+msgid "unable to update medium \"%s\"\n"
+msgstr "���������� ���������������� �� ���������� \"%s\"\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "���� �� ���� ������ � ���������:"
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "���������� ����������� �� ���������� \"%s\"\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "����� � ������ �����? (1-%d) "
-
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "���������,��� �����, �������� ������\n"
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
 "%s\n"
-"do you agree ?"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi_.c:402
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
-
-#: ../urpmi_.c:407
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi_.c:409
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "���������� �������� �� rpm ����� [%s] �� ���������� \"%s\""
+
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - �������� �� ������������ �� hdlist �������.\n"
 
-#: ../urpmi_.c:421
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
-"����� ������ ������ �� ����� ���������� �� �� �� ����������, ���� �� �� "
-"�������� ��� ���\n"
+"  -h             - ������ �� ������� � ������� ������ or hdlist ����.\n"
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - ���������� �� ����� ��� ������������.\n"
+
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"�� �� �� ������� �������������,���� ������ �� ����� ����������� (%d MB)"
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
-
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
+"  --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 ""
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+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 ""
 
-#: ../urpmi_.c:507
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "���� ������� \"%s\" � ���������� [%s]"
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "��������� Enter,������ ��� ������..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "���� ������ �������� %s: %s"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr ""
-
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (�/�) "
-
-#: ../urpmi_.c:548
-#, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
+"  --distrib      - ����������� ��������� �� ������ ����� �� ������������� "
+"���������.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "������������ ���������"
-
-#: ../urpmi_.c:572
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "����������� %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "���� �� ����������� ��� �������� �� �����������? (�/�) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "���� �� ����������� ���� ��-����� (--force)? (�/�) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "������ � ����������� ����"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - ��������� �� ������ ���������.\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_.c:46
-#, fuzzy
-msgid "  --list         - list available packages.\n"
-msgstr "  --all           - ��������� ������ ������."
-
-#: ../urpmq_.c:47
-#, fuzzy
-msgid "  --list-media   - list available media.\n"
-msgstr "  --all           - ��������� ������ ������."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
 
-#: ../urpmq_.c:48
-#, fuzzy
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --all           - ��������� ������ ������."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "���� �� ���������� (������� urpmi.addmedia �� �������� �� ���������)\n"
 
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --all           - ��������� ������ ������."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr ""
 
-#: ../urpmq_.c:51
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpmi.removemedia:1
+#, fuzzy, 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 ""
+"��������: urpmi.removemedia [-a] <���> ...\n"
+"������ <���> � ��� �� ��������� �� ����������.\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      - ����� ������ ���� ������ ����� �������� (���� root).\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "���� �� ������� (������� urpmi.addmedia �� �������� �� ���������)\n"
 
-#: ../urpmq_.c:64
-#, fuzzy
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - �������� ������ ��� ���� � ����������� �� ����� ������.\n"
 
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    �������� ��� �� ��� ��� �� �����)."
-
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -f             - ��������� ������,���������� � ����������� � ���.\n"
-
-#: ../urpmq_.c:70
-#, fuzzy
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - ��������� ���� ������� � �����.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr ""
 
-#: ../urpmq_.c:71
-#, fuzzy
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - ��������� ������ � ���� ���� ���������� � ���.\n"
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - ��������� �� ������ ���������.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
+# in this case must be "���������"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"usage: urpmi.update [options] <name> ...\n"
+"������ <���> � ��� �� ��������� �� ������.\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - ��������� ������ ������."
 
-#: placeholder.h:18
-#, fuzzy, c-format
-msgid "urpmf version %s"
-msgstr "urpmf ������ %s"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "����� �� ����������: urpmf [<����>]"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - ��������� ������ � ���� ���� ���������� � ���.\n"
 
-#: placeholder.h:22
-#, fuzzy
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - �� ��������� ����� �� ���� (�� ������������ ��� �� � "
-"������� ��� �� ���������"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - ��������� ���� ������� � �����.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    ���, ����������� � ������������� ����� �� ������)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -f             - ��������� ������,���������� � ����������� � ���.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - ��������� ������ ������."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    �������� ��� �� ��� ��� �� �����)."
 
-#: placeholder.h:25
-#, fuzzy
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - ��������� ����� �� ����: ����� �� rpm ����� (�� "
-"������������ ��� �� � ������� ���"
+"  -u             - �������� ������ ��� ���� � ����������� �� ����� ������.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    �������� ��� �� ��� ��� �� �����)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
 
-# msgstr "  --group         - ��������� ������� ������: group."
-#: placeholder.h:27
-#, fuzzy
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - ��������� ������� �� ������: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - ����� ������ ���� ������ ����� �������� (���� root).\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - ��������� ������� �� ����: size."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
 
-#: placeholder.h:29
-#, fuzzy
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --size          - ��������� ������� �� ����: size."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --all           - ��������� ������ ������."
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - ��������� ������ �� ����: summary."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --all           - ��������� ������ ������."
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - ��������� �������� �� ����: description."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --all           - ��������� ������ ������."
 
-#: placeholder.h:32
-#, fuzzy
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr ""
-"  --requires      - ��������� ���������� �� ����: ������ ���������� "
-"(��������� ������)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --all           - ��������� ������ ������."
 
-#: placeholder.h:33
-#, fuzzy
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
-"  --requires      - ��������� ���������� �� ����: ������ ���������� "
-"(��������� ������)."
 
-#: placeholder.h:34
-#, fuzzy
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --requires      - ��������� ���������� �� ����: ������ ���������� "
-"(��������� ������)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "������������ ���������"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
-"  --conflicts     - ��������� ����������� �� ����: ������ ��������� "
-"(��������� ������)."
 
-#: placeholder.h:36
-#, fuzzy
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
-"  --conflicts     - ��������� ����������� �� ����: ������ ��������� "
-"(��������� ������)."
 
-#: placeholder.h:37
-#, fuzzy
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
-"  --requires      - ��������� ���������� �� ����: ������ ���������� "
-"(��������� ������)."
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "urpmf --help �� ������ �����"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "������������ ���������"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
-#, fuzzy
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "wget ���������: ����� � %d ��� ������ %d\n"
-
-# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
-# in this case must be "���������"
-#, fuzzy
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "���������� \"%s\" ����� ���� �� ������ ���� ��������� hdlist, ���������� "
-#~ "� ���������"
-
 #~ msgid "nothing to write in list file for \"%s\""
 #~ msgstr "���� ���� �� ����� � ���� ����� �� \"%s\""
 
diff --git a/po/bs.po b/po/bs.po
index 3a6f2566..d6664c08 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,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: 2001-09-19 13:34GMT\n"
 "Last-Translator: Amila Akagi� <bono@lugbih.org>\n"
 "Language-Team: Bosnian <lokal-subscribe@lugbih.org>\n"
@@ -13,683 +13,801 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.1\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instaliram %s\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 "DdYy"
 
-#: ../_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 "Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf verzija %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Autorska prava (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 ""
-"Automatska instalacija paketa..\n"
-"Zahtjevali ste instalaciju paketa %s\n"
+"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Je li u redu?"
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "upotreba: urpmf [opcije] <datoteka>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "U redu"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Odustani"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_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 "DdYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (D/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: komanda nije prona�ena\n"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr ""
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: ../urpm.pm_.c:226
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ne mogu update-irati medij \"%s\"\n"
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr ""
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "Instalacija nije uspjela"
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:288
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:556
-#, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:572
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "poku�ajte urpmf --help za vi�e opcija"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr ""
+
+#: ../_irpm:1
+#, c-format
+msgid "%s: command not found\n"
+msgstr "%s: komanda nije prona�ena\n"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid " (Y/n) "
+msgstr " (D/n) "
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Cancel"
+msgstr "Odustani"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "U redu"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Je li u redu?"
+
+#: ../_irpm:1
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Automatska instalacija paketa..\n"
+"Zahtjevali ste instalaciju paketa %s\n"
 
-#: ../urpm.pm_.c:578
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
+msgid "installing %s\n"
+msgstr "instaliram %s\n"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "unable to open rpmdb"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nisam u mogu�nosti da zapi�em konf. datoteku [%s]"
+msgid "unable to access rpm file [%s]"
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne mogu update-irati medij \"%s\"\n"
+msgid "unable to install package %s"
+msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ne mogu update-irati medij \"%s\"\n"
+msgid "unable to remove package %s"
+msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
+#, c-format
+msgid "Preparing..."
+msgstr ""
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "...retrieving failed: %s"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:622
-#, fuzzy, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne mogu update-irati medij \"%s\"\n"
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, c-format
+msgid "...retrieving done"
+msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
+#, c-format
+msgid "malformed input: [%s]"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "unable to access medium \"%s\""
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:659
-#, fuzzy, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne mogu kreirati medij \"%s\"\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "urpmi database locked"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
+
+#: ../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)"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../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 "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Jedan od sljede�ih paketa je potreban:"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nisam u mogu�nosti da zapi�em konf. datoteku [%s]"
+msgid "no package named %s"
+msgstr ""
 
-#: ../urpm.pm_.c:735
-#, fuzzy, c-format
-msgid "write config file [%s]"
-msgstr "nisam u mogu�nosti da zapi�em konf. datoteku [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to register rpm file"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "retrieving rpm file [%s] ..."
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "invalid rpm file name [%s]"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ne mogu update-irati medij \"%s\"\n"
+msgid "unmounting %s"
+msgstr "instaliram %s\n"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "instaliram %s\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../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
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "ne mogu update-irati medij \"%s\"\n"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../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
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
+msgid "building hdlist [%s]"
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "ne mogu update-irati medij \"%s\"\n"
-
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
+msgid "reading headers from medium \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "added medium %s"
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: ../urpm.pm_.c:933
-#, fuzzy
-msgid "unable to access first installation medium"
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:937
-#, fuzzy
-msgid "copying hdlists file..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "nothing written in list file for \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr ""
-
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "Instalacija nije uspjela"
-
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
-#, fuzzy
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../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 "file [%s] already used in the same 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 "ne mogu kreirati medij \"%s\"\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ne mogu update-irati medij \"%s\"\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "examining MD5SUM file"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "\"%s\""
-msgstr ""
-
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving description file of \"%s\"..."
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu update-irati medij \"%s\"\n"
+msgid "no rpm files found from [%s]"
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
+msgid "unable to read rpm files from [%s]: %s"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "reading rpm files from [%s]"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
+#, c-format
+msgid "...copying done"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy of [%s] failed"
+msgid "...copying failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "ne mogu kreirati medij \"%s\"\n"
+msgid "copy of [%s] failed"
+msgstr "Instalacija nije uspjela"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no rpm files found from [%s]"
+msgid "copying description file of \"%s\"..."
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid "removing medium \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "selecting multiple media: %s"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ne mogu update-irati medij \"%s\"\n"
+msgid "retrieving hdlists file..."
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
+msgid "copying hdlists file..."
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
+msgid "unable to access first installation medium"
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "added medium %s"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: ../urpm.pm_.c:1597
-#, fuzzy, c-format
-msgid "building hdlist [%s]"
+msgid "problem reading hdlist file of medium \"%s\""
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
+#, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "unable to use parallel option \"%s\""
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1651
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "mounting %s"
-msgstr "instaliram %s\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "instaliram %s\n"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "write config file [%s]"
+msgstr "nisam u mogu�nosti da zapi�em konf. datoteku [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "unable to write config file [%s]"
+msgstr "nisam u mogu�nosti da zapi�em konf. datoteku [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
+msgid "too many mount points for removable medium \"%s\""
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne mogu kreirati medij \"%s\"\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1960
-#, c-format
-msgid "no package named %s"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Jedan od sljede�ih paketa je potreban:"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:2105 ../urpm.pm_.c:2137 ../urpm.pm_.c:2159
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nisam u mogu�nosti da zapi�em konf. datoteku [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../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 "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
+msgid "medium \"%s\" trying to use an already used list, 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 "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu kreirati medij \"%s\"\n"
+msgid "syntax error in config file at line %s"
+msgstr "nisam u mogu�nosti da zapi�em konf. datoteku [%s]"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
-
-#: ../urpm.pm_.c:2457
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalacija nije uspjela"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
+msgid "copy failed: %s"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Instalacija nije uspjela"
+msgid "unable to handle protocol: %s"
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../urpme_.c:39
-#, fuzzy, 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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
 msgstr ""
-"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Da bi zadovoljili dependencies, sljede�i paketi �e biti instalirani (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Jedan od sljede�ih paketa je potreban:"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme_.c:64
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", provjeri upotrebu sa --help\n"
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
+msgstr ""
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr ""
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr ""
 
-#: ../urpme_.c:93
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nepoznata opcija \"-%s\", provjeri upotrebu sa --help\n"
+
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Jedan od sljede�ih paketa je potreban:"
-
-#: ../urpme_.c:105
-#, fuzzy, c-format
+#: ../urpme:1 ../urpmi:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Da bi zadovoljili dependencies, sljede�i paketi �e biti instalirani (%d MB)"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../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 ""
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, fuzzy, 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"
@@ -697,800 +815,846 @@ msgid ""
 msgstr ""
 "Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr ""
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"koristi: urpmi.addmedia <ime> <url>\n"
-"gdje je <url> jedan od\n"
-"       file://<putanja>\n"
-"       ftp://<korisni�ko_ime>:<�ifra>@<host>/<putanja> with <relativnim "
-"nazivom datoteke hdlist>\n"
-"       ftp://<host>/<putanja> with <relativnim nazivom datoteke hdlist>\n"
-"       http://<host>/<path> with <relativnim nazivom datoteke hdlist>\n"
-"       removable_<ure�aj>://<putanja>\n"
+"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "sve je ve� instalirano"
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Instalacija nije uspjela"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Poku�aj instalaciju jo� ja�e (--force opcija)? (d/N) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Poku�aj instalaciju bez provjere dependencies? (d/N)"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "instaliram %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../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 ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (D/n) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Jedan od sljede�ih paketa je potreban:"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Pritisnite enter kada zavr�i..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Molim ubacite medij sa imenom \"%s\" u ure�aj [%s]"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "ne mogu dobiti izvorni paket, prekidam"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
+"Da bi zadovoljili dependencies, sljede�i paketi �e biti instalirani (%d MB)"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"do you agree ?"
 msgstr ""
-"%s\n"
-"<relativna putanja do datoteke hdlist> nedostaje\n"
+"neki paketi trebaju biti uklonjeni da bi mogli biti nadogra�eni, ovo jo� "
+"nije podr�ano\n"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne mogu update-irati medij \"%s\"\n"
+msgid "unrequested"
+msgstr ""
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "due to conflicts with %s"
 msgstr ""
-"%s\n"
-"<relativna putanja do datoteke hdlist> nedostaje\n"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+msgid "due to missing %s"
 msgstr ""
-"%s\n"
-"`with' nedostaje za ftp medij\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne mogu kreirati medij \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"koristi: urpmi.removemedia [-a] <ime> ...\n"
-"gdje je <ime> naziv medija za uklanjanje.\n"
-"   -a    izabrat �e sve medije.\n"
-"\n"
-"nepoznate opcije '%s'\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ni�ta za uklanjanje (koristi urpmi.addmedia da doda� medij)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "�ao mi je, lo� izbor, probaj kasnije\n"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"stavka za brisanje nedostaje\n"
-"(jedan od %s)\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Va� izbor je? (1-%d) "
 
-#: ../urpmi.update_.c:60
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"koristi: urpmi.removemedia [-a] <ime> ...\n"
-"gdje je <ime> naziv medija za uklanjanje.\n"
-"   -a    izabrat �e sve medije.\n"
-"\n"
-"nepoznate opcije '%s'\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Jedan od sljede�ih paketa je potreban:"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jedan od sljede�ih paketa je potreban:"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
+
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ni�ta za update (koriti urpmi.addmedia da doda� medij)\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nepoznata opcija \"-%s\", provjeri upotrebu sa --help\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"stavka za update nedostaje\n"
-"(jedan od %s)\n"
 
-#: ../urpmi_.c:67
-#, fuzzy, 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"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../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 "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", provjeri upotrebu sa --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
+#: ../urpmi:1
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jedan od sljede�ih paketa je potreban:"
+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 ""
+"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Jedan od sljede�ih paketa je potreban:"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Va� izbor je? (1-%d) "
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne mogu kreirati medij \"%s\"\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "�ao mi je, lo� izbor, probaj kasnije\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
+msgstr ""
+"%s\n"
+"`with' nedostaje za ftp medij\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
 "%s\n"
-"do you agree ?"
+"<relative path of hdlist> missing\n"
 msgstr ""
+"%s\n"
+"<relativna putanja do datoteke hdlist> nedostaje\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
-
-#: ../urpmi_.c:407
-#, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
+"%s\n"
+"<relativna putanja do datoteke hdlist> nedostaje\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "ne mogu kreirati medij \"%s\"\n"
+
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:416
-msgid "unrequested"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi_.c:421
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
-"neki paketi trebaju biti uklonjeni da bi mogli biti nadogra�eni, ovo jo� "
-"nije podr�ano\n"
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
-"Da bi zadovoljili dependencies, sljede�i paketi �e biti instalirani (%d MB)"
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "ne mogu dobiti izvorni paket, prekidam"
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+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 ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Molim ubacite medij sa imenom \"%s\" u ure�aj [%s]"
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Pritisnite enter kada zavr�i..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Jedan od sljede�ih paketa je potreban:"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+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 ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (D/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"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "instaliram %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Poku�aj instalaciju bez provjere dependencies? (d/N)"
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Poku�aj instalaciju jo� ja�e (--force opcija)? (d/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "sve je ve� instalirano"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: ../urpmq_.c:35
+#: ../urpmi.addmedia:1
 #, fuzzy, 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"
-msgstr ""
-"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+"and [options] are from\n"
 msgstr ""
+"koristi: urpmi.addmedia <ime> <url>\n"
+"gdje je <url> jedan od\n"
+"       file://<putanja>\n"
+"       ftp://<korisni�ko_ime>:<�ifra>@<host>/<putanja> with <relativnim "
+"nazivom datoteke hdlist>\n"
+"       ftp://<host>/<putanja> with <relativnim nazivom datoteke hdlist>\n"
+"       http://<host>/<path> with <relativnim nazivom datoteke hdlist>\n"
+"       removable_<ure�aj>://<putanja>\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"stavka za brisanje nedostaje\n"
+"(jedan od %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ni�ta za uklanjanje (koristi urpmi.addmedia da doda� medij)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, fuzzy, 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 ""
+"koristi: urpmi.removemedia [-a] <ime> ...\n"
+"gdje je <ime> naziv medija za uklanjanje.\n"
+"   -a    izabrat �e sve medije.\n"
+"\n"
+"nepoznate opcije '%s'\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 ""
+"stavka za update nedostaje\n"
+"(jedan od %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ni�ta za update (koriti urpmi.addmedia da doda� medij)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr ""
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"koristi: urpmi.removemedia [-a] <ime> ...\n"
+"gdje je <ime> naziv medija za uklanjanje.\n"
+"   -a    izabrat �e sve medije.\n"
+"\n"
+"nepoznate opcije '%s'\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf verzija %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu pro�itati rpm datoteku \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Autorska prava (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nepoznata opcija \"-%s\", provjeri upotrebu sa --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
 
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "upotreba: urpmf [opcije] <datoteka>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, 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"
+"\n"
+"usage:\n"
 msgstr ""
+"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalacija nije uspjela"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "poku�ajte urpmf --help za vi�e opcija"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Instalacija nije uspjela"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: nepoznata opcija \"-%s\", provjeri upotrebu sa --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: ne mogu pro�itati rpm datoteku \"%s\"\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi nije instaliran"
 
diff --git a/po/ca.po b/po/ca.po
index 165c91b7..27e0df57 100644
--- a/po/ca.po
+++ b/po/ca.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: 2002-09-05 20:23+0200\n"
 "Last-Translator: Softcatal� <traddrake@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -13,1189 +13,1284 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "s'est� instal�lant %s\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 "SsYy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versi� %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Instal�laci� autom�tica dels paquets...\n"
-"Heu demanat la instal�laci� del paquet %s\n"
+"Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "�s correcte?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "sintaxi: urpmf [opcions] <fitxer>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "D'acord"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - no mostris el nom de l'etiqueta (per defecte si no "
+"s'indica cap etiqueta a la l�nia"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Cancel�la"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    d'ordres, incompatible amb el mode interactiu)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - mostra totes les etiquetes."
 
-#: ../_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 "SsYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - mostra l'etiqueta 'name': nom del fitxer rpm (suposant "
+"que no s'ha indicat cap etiqueta a"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (S/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    la l�nia d'ordres per� sense el nom del paquet)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - mostra l'etiqueta 'group': grup."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - mostra l'etiqueta 'size': mida."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - mostra l'etiqueta 'serial': s�rie."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - mostra l'etiqueta 'summary': resum."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - mostra l'etiqueta 'description': descripci�."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - mostra l'etiqueta 'provides': tots els "
+"'provides' (l�nies m�ltiples)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - mostra l'etiqueta 'requires': tots els "
+"'requires' (l�nies m�ltiples)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - mostra l'etiqueta 'files': tots els fitxers (l�nies "
+"m�ltiples)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - mostra l'etiqueta 'conflicts': tots els conflictes "
+"(l�nies m�ltiples)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - mostra l'etiqueta 'obsoletes': tots els obsolets (l�nies "
+"m�ltiples)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - mostra l'etiqueta 'prereqs': tots els 'prereqs' (l�nies "
+"m�ltiples)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "proveu urpmf --help per veure m�s opcions"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "no s'ha trobat cap llista de suports completa"
 
-#: ../_irpm_.c:63
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: no s'ha trobat l'ordre\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch `%s' desconegut !!!\n"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "el protocol definit per a %s �s desconegut"
+msgid "Cancel"
+msgstr "Cancel�la"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "no s'ha trobat cap webfetch (actualment curl o wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "D'acord"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "incap�s de gestionar el protocol: %s"
+msgid "Is this OK?"
+msgstr "�s correcte?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Instal�laci� autom�tica dels paquets...\n"
+"Heu demanat la instal�laci� del paquet %s\n"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "s'est� instal�lant %s\n"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...la c�pia ha fallat"
+msgid "unable to open rpmdb"
+msgstr "no s'ha pogut registrar el fitxer rpm"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "no es troba wget\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ha fallat: s'ha sortit amb %d o senyal %d\n"
+msgid "%s conflicts with %s"
+msgstr "%s conflicteix amb %s"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "no s'ha trobat curl\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr "%s �s necessitat per %s"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"el suport \"%s\" ha provat d'utilitzar un fitxer list en �s, suport ignorat"
+msgid "unable to install package %s"
+msgstr "no s'ha pogut instal�lar el paquet %s"
 
-#: ../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 ""
-"no s'ha pogut tenir cura del suport \"%s\" perqu� el fitxer list �s "
-"utilitzat per un altre suport"
+msgid "unable to remove package %s"
+msgstr "no s'ha pogut esborrar el paquet %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"no es pot utilitzar el nom \"%s\" per al suport sense nom perqu� ja est� en "
-"�s"
+msgid "Preparing..."
+msgstr "S'est� preparant..."
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"no es pot tenir en compte el suport \"%s\" perqu� no existeix cap fitxer "
-"list [%s]"
+msgid "...retrieving failed: %s"
+msgstr "...ha fallat la recuperaci�: %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "no es pot determinar el suport d'aquest fitxer hdlist [%s]"
+msgid "...retrieving done"
+msgstr "...recuperaci� feta"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "s'estan recuperant els fitxers rpm..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "no es pot accedir al fitxer hdlist de \"%s\", suport ignorat"
+msgid "malformed input: [%s]"
+msgstr "entrada mal formada: [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "no es pot accedir al fitxer list de \"%s\", s'ignora el suport"
+msgid "unable to access medium \"%s\""
+msgstr "no s'ha pogut accedir al suport \"%s\""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "provant de passar per alt el suport existent \"%s\", evitant"
+msgid "urpmi database locked"
+msgstr "la base de dades de l'urpmi est� blocada"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "no es pot trobar el fitxer hdlist per a \"%s\", s'ignora el suport"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"suport incoherent \"%s\", marcat com a extra�ble per� no �s aix� realment"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "no es pot trobar el fitxer list per a \"%s\", s'ha ignorat el suport"
+msgid "medium \"%s\" is not selected"
+msgstr "suport \"%s\" no ha estat selleccionat"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "fitxer list incoherent per \"%s\", s'ha ignorat el suport"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no s'ha pogut llegir el fitxer rpm [%s] des del suport \"%s\""
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "package %s is not found."
+msgstr "no s'ha trobat el paquet %s."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
-"no s'ha estat cap�s d'inspeccionar el fitxer list per \"%s\", s'ha ignorat "
-"el suport"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "massa punts de muntatge per al suport extra�ble \"%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:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "agafant dispositiu extra�ble com a \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "hi ha m�ltiples paquets amb el mateix fitxer rpm \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "no s'ha pogut analitzar correctament [%s] en el valor \"%s\""
+
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "utilitzant un dispositiu extra�ble diferent [%s] per \"%s\""
+msgid "The following packages contain %s: %s"
+msgstr "Els paquets seg�ents contenen %s: %s"
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no s'ha pogut determinar el cami i el nom del suport extra�ble \"%s\""
+msgid "no package named %s"
+msgstr "no hi cap paquet anomenat %s"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "no s'ha pogut escriure el fitxer de configuraci� [%s]"
+msgid "error registering local packages"
+msgstr "error registrant els paquets locals"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "s'estan recuperant els fitxers rpm..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "escriure fitxer de configuraci� [%s]"
+msgid "invalid rpm file name [%s]"
+msgstr "el nom del fitxer rpm �s incorrecte [%s]"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
+msgid "no entries relocated in depslist"
+msgstr "cap entrada reubicada en depslist"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "examinant manejador paral�lel en fitxer [%s]"
+msgid "relocated %s entries in depslist"
+msgstr "%s entrades reubicades en despslist"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "s'ha trobat un manejador paral�lel per als nodes: %s"
+msgid "unmounting %s"
+msgstr "s'est� desmuntant %s"
 
-#: ../urpm.pm_.c:780
-#, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "utilitzant suport associat al mode paral�lel : %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "s'est� muntant %s"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "no s'ha pogut usar l'opci� de paral�lel \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "s'estan esborrant %d cap�aleres obsoletes de la mem�ria cau"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis no es pot usar amb --media, --update o --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "s'han trobat %d cap�aleres a la mem�ria cau"
 
-#: ../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 "built hdlist synthesis file for medium \"%s\""
+msgstr "s'ha constru�t el fitxer de s�ntesi hdlist per al suport \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "examinant el fitxer hdlist [%s]"
 
-#: ../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]"
 msgstr "s'est� examinant el fitxer de s�ntesi [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "s'ha trobat un problema llegint el fitxer hdlist del suport \"%s\""
+msgid "building hdlist [%s]"
+msgstr "s'est� construint l'hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "s'estan llegint les cap�aleres per al suport \"%s\""
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr "fent segona passada per a computar depend�ncies\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "s'ha trobat un problema llegint el fitxer de s�ntesi del suport \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "no s'ha pogut registrar el fitxer rpm"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "el suport \"%s\" ja existeix"
+msgid "nothing written in list file for \"%s\""
+msgstr "no s'ha escrit res al fitxer list per a \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "no s'ha trobat el fitxer hdlist per al suport \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "s'ha afegit el suport %s"
+msgid "unable to write list file of \"%s\""
+msgstr "no es pot escriure el fitxer list de \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "no s'ha pogut accedir al primer suport d'instal�laci�"
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "el fitxer [%s] ja s'est� utilitzant en el mateix suport \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "s'est� copiant el fitxer hdlists..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "no es pot analitzar el fitxer hdlist de \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "..c�pia feta"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "no s'ha trobat el fitxer hdlist per al suport \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "..c�pia feta"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "no s'ha pogut recuperar l'hdlist (o la s�ntesi) font"
 
-#: ../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)"
-msgstr ""
-"no s'ha pogut accedir al primer suport d'instal�laci� (no s'ha trobat fitxer "
-"Mandrake/base/hdlists)"
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "examinant el fitxer MD5SUM"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "s'est� recuperant el fitxer hdlists..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "s'est� copiant l'hdlist (o la s�ntesi) font de \"%s\"..."
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...recuperaci� feta"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "s'est� recuperant el hdlist font (o la s�ntesi) de \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ha fallat la recuperaci�: %s"
+msgid "retrieving description file of \"%s\"..."
+msgstr "s'est� recuperant el fitxer de descripci� de \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descripci� hdlist incorrecta \"%s\" en el fitxer hdlists"
+msgid "no rpm files found from [%s]"
+msgstr "no s'han trobat fitxers rpm des de [%s]"
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "s'ha provant de seleccionar un suport inexistent \"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "no s'ha pogut llegir els fitxers rpm des de [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "reading rpm files from [%s]"
+msgstr "s'est� llegint els fitxers rpm des de [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "s'estan seleccionant suports m�ltiples; %s"
+msgid "...copying done"
+msgstr "..c�pia feta"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "..c�pia feta"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "s'est� esborrant suport \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "s'est� copiant el fitxer list font de \"%s\"..."
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "la base de dades de l'urpmi est� blocada"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "la c�pia de [%s] ha fallat"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no s'ha pogut accedir al suport \"%s\""
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "s'est� copiant l'hdlist (o la s�ntesi) font de \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "s'est� copiant el fitxer de descripci� de \"%s\"..."
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "s'est� copiant l'hdlist (o la s�ntesi) font de \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "s'est� esborrant suport \"%s\""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "la c�pia de [%s] ha fallat"
+msgid "selecting multiple media: %s"
+msgstr "s'estan seleccionant suports m�ltiples; %s"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "examinant el fitxer MD5SUM"
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "s'est� copiant el fitxer list font de \"%s\"..."
+msgid "trying to select inexistent medium \"%s\""
+msgstr "s'ha provant de seleccionar un suport inexistent \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "s'est� llegint els fitxers rpm des de [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"no s'ha pogut accedir al primer suport d'instal�laci� (no s'ha trobat fitxer "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "no s'ha pogut llegir els fitxers rpm des de [%s]: %s"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descripci� hdlist incorrecta \"%s\" en el fitxer hdlists"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "no s'han trobat fitxers rpm des de [%s]"
+msgid "retrieving hdlists file..."
+msgstr "s'est� recuperant el fitxer hdlists..."
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "s'est� recuperant el fitxer de descripci� de \"%s\"..."
+msgid "copying hdlists file..."
+msgstr "s'est� copiant el fitxer hdlists..."
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "s'est� recuperant el hdlist font (o la s�ntesi) de \"%s\"..."
+msgid "unable to access first installation medium"
+msgstr "no s'ha pogut accedir al primer suport d'instal�laci�"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "no s'ha pogut recuperar l'hdlist (o la s�ntesi) font"
+#: ../urpm.pm:1
+#, c-format
+msgid "added medium %s"
+msgstr "s'ha afegit el suport %s"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "no s'ha trobat el fitxer hdlist per al suport \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "el suport \"%s\" ja existeix"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "el fitxer [%s] ja s'est� utilitzant en el mateix suport \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "s'ha trobat un problema llegint el fitxer hdlist del suport \"%s\""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "no es pot analitzar el fitxer hdlist de \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis no es pot usar amb --media, --update o --parallel"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "no es pot escriure el fitxer list de \"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "no s'ha pogut usar l'opci� de paral�lel \"%s\""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "no s'ha trobat el fitxer hdlist per al suport \"%s\""
+msgid "using associated media for parallel mode: %s"
+msgstr "utilitzant suport associat al mode paral�lel : %s"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "no s'ha escrit res al fitxer list per a \"%s\""
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "fent segona passada per a computar depend�ncies\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "s'ha trobat un manejador paral�lel per als nodes: %s"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "s'estan llegint les cap�aleres per al suport \"%s\""
+msgid "examining parallel handler in file [%s]"
+msgstr "examinant manejador paral�lel en fitxer [%s]"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "s'est� construint l'hdlist [%s]"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "s'ha constru�t el fitxer de s�ntesi hdlist per al suport \"%s\""
+msgid "write config file [%s]"
+msgstr "escriure fitxer de configuraci� [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "s'han trobat %d cap�aleres a la mem�ria cau"
+msgid "unable to write config file [%s]"
+msgstr "no s'ha pogut escriure el fitxer de configuraci� [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "s'estan esborrant %d cap�aleres obsoletes de la mem�ria cau"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "no s'ha pogut determinar el cami i el nom del suport extra�ble \"%s\""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "s'est� muntant %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "utilitzant un dispositiu extra�ble diferent [%s] per \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "s'est� desmuntant %s"
+msgid "taking removable device as \"%s\""
+msgstr "agafant dispositiu extra�ble com a \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s entrades reubicades en despslist"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "massa punts de muntatge per al suport extra�ble \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "cap entrada reubicada en depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"no s'ha estat cap�s d'inspeccionar el fitxer list per \"%s\", s'ha ignorat "
+"el suport"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "el nom del fitxer rpm �s incorrecte [%s]"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "fitxer list incoherent per \"%s\", s'ha ignorat el suport"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "s'estan recuperant els fitxers rpm..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "no es pot trobar el fitxer list per a \"%s\", s'ha ignorat el suport"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "no es pot trobar el fitxer hdlist per a \"%s\", s'ignora el suport"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "provant de passar per alt el suport existent \"%s\", evitant"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "error registrant els paquets locals"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "no es pot accedir al fitxer list de \"%s\", s'ignora el suport"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "no hi cap paquet anomenat %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "no es pot accedir al fitxer hdlist de \"%s\", suport ignorat"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Els paquets seg�ents contenen %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "no es pot determinar el suport d'aquest fitxer hdlist [%s]"
 
-#: ../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\""
-msgstr "hi ha m�ltiples paquets amb el mateix fitxer rpm \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"no es pot tenir en compte el suport \"%s\" perqu� no existeix cap fitxer "
+"list [%s]"
 
-#: ../urpm.pm_.c:2147
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "no s'ha pogut analitzar correctament [%s] en el valor \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"no es pot utilitzar el nom \"%s\" per al suport sense nom perqu� ja est� en "
+"�s"
 
-#: ../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)"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"no s'ha pogut tenir cura del suport \"%s\" perqu� el fitxer list �s "
+"utilitzat per un altre suport"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
+"el suport \"%s\" ha provat d'utilitzar un fitxer list en �s, suport ignorat"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "no s'ha trobat el paquet %s."
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "el suport \"%s\" ha provat d'utilitzar un hdlist en �s, suport ignorat"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "suport \"%s\" no ha estat selleccionat"
+msgid "syntax error in config file at line %s"
+msgstr "error de sintaxi en fitxer de configuraci� a la l�nia %s"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no s'ha pogut llegir el fitxer rpm [%s] des del suport \"%s\""
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
-"suport incoherent \"%s\", marcat com a extra�ble per� no �s aix� realment"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "entrada mal formada: [%s]"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync ha fallat: s'ha sortit amb %d o senyal %d\n"
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "s'estan recuperant els fitxers rpm..."
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "falta ssh\n"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "S'est� preparant..."
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync is missing\n"
+msgstr "no s'ha trobat rsync\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "no s'ha pogut esborrar el paquet %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl ha fallat: s'ha sortit amb %d o senyal %d\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "no s'ha pogut instal�lar el paquet %s"
+msgid "curl is missing\n"
+msgstr "no s'ha trobat curl\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s �s necessitat per %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget ha fallat: s'ha sortit amb %d o senyal %d\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s conflicteix amb %s"
+msgid "wget is missing\n"
+msgstr "no es troba wget\n"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "...la c�pia ha fallat"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "incap�s de gestionar el protocol: %s"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "no s'ha trobat cap webfetch (actualment curl o wget)\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 "La instal�laci� ha fallat en el node %s"
+msgid "unknown protocol defined for %s"
+msgstr "el protocol definit per a %s �s desconegut"
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-msgid "Installation is possible"
-msgstr "La instal�laci� �s possible"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Webfetch `%s' desconegut !!!\n"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "La instal�laci� ha fallat en el node %s"
-
-#: ../urpm/parallel_ssh.pm_.c:167
-#, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "ordinador central %s no t� una bona versi� de urpmi"
+msgid "Removing failed"
+msgstr "...la c�pia ha fallat"
 
-#: ../urpme_.c:39
+#: ../urpme: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 versi� %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
-"GNU.\n"
-"\n"
-"sintaxi:\n"
-
-#: ../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         - mostra aquest missatge d'ajuda.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --auto         - en escollir, selecciona un paquest autom�ticament.\n"
-
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - verifica si la instal�laci� pot ser duta a terme.\n"
+"Per a complir les depend�ncies, els paquets seg�ents s'esborraran (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi distribu�t per els ordinadors de l'alias.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Cal un dels paquets seg�ents:"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Res a esborrar.\n"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opci� desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
+msgid "removing package %s will break your system"
+msgstr "esborrar paquet %s trencar� el vostre sistema\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "paquet desconegut "
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "paquets desconeguts "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "esborrar paquet %s trencar� el vostre sistema\n"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: opci� desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
 
-#: ../urpme_.c:95
-#, fuzzy
-msgid "Nothing to remove"
-msgstr "Res a esborrar.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Cal un dels paquets seg�ents:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi distribu�t per els ordinadors de l'alias.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - verifica si la instal�laci� pot ser duta a terme.\n"
+
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
-"Per a complir les depend�ncies, els paquets seg�ents s'esborraran (%d MB)"
+"  --auto         - en escollir, selecciona un paquest autom�ticament.\n"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "...la c�pia ha fallat"
+#: ../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         - mostra aquest missatge d'ajuda.\n"
 
-#: ../urpmf_.c:26
-#, fuzzy, c-format
+#: ../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 ""
-"urpmq versi� %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"urpme versi� %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
 "GNU.\n"
 "\n"
 "sintaxi:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - utilitza nom�s els suports d'actualitzaci�.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - utilitza nom�s els suports llistats amb comes.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  -a             - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"  --synthesis    - utilitza la s�ntesi donada en comptes de la bd de urpmi.\n"
+"  -a             - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
 
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - mode detallat.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
+"  -u             - elimina el paquet si ja hi ha instal�lada una versi� "
+"millor.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - no mostris el nom de l'etiqueta (per defecte si no "
-"s'indica cap etiqueta a la l�nia"
-
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - mostra totes les etiquetes."
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - mostra l'etiqueta 'name': nom del fitxer rpm (suposant "
-"que no s'ha indicat cap etiqueta a"
-
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - mostra l'etiqueta 'group': grup."
-
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - mostra l'etiqueta 'size': mida."
-
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - mostra l'etiqueta 'size': mida."
-
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - mostra l'etiqueta 'summary': resum."
+"  -u             - elimina el paquet si ja hi ha instal�lada una versi� "
+"millor.\n"
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - mostra l'etiqueta 'description': descripci�."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - buida el directori de mem�ria cau de cap�aleres.\n"
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --provides      - mostra l'etiqueta 'provides': tots els "
-"'provides' (l�nies m�ltiples)."
+"  -f             - mostra la versi�, llan�ament i arquitectura amb el nom.\n"
 
-#: ../urpmf_.c:47
-#, fuzzy
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
-msgstr ""
-"  --requires      - mostra l'etiqueta 'requires': tots els "
-"'requires' (l�nies m�ltiples)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - imposa la generaci� de fitxers hdlist.\n"
 
-#: ../urpmf_.c:48
-#, fuzzy
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --files         - mostra l'etiqueta 'files': tots els fitxers (l�nies "
+"  --obsoletes     - mostra l'etiqueta 'obsoletes': tots els obsolets (l�nies "
 "m�ltiples)."
 
-#: ../urpmf_.c:49
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
 "  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 "  --conflicts     - mostra l'etiqueta 'conflicts': tots els conflictes "
 "(l�nies m�ltiples)."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - mostra l'etiqueta 'obsoletes': tots els obsolets (l�nies "
+"  --files         - mostra l'etiqueta 'files': tots els fitxers (l�nies "
 "m�ltiples)."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - imposa la generaci� de fitxers hdlist.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+"  --requires      - mostra l'etiqueta 'requires': tots els "
+"'requires' (l�nies m�ltiples)."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  -f             - mostra la versi�, llan�ament i arquitectura amb el nom.\n"
+"  --provides      - mostra l'etiqueta 'provides': tots els "
+"'provides' (l�nies m�ltiples)."
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - buida el directori de mem�ria cau de cap�aleres.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - mostra l'etiqueta 'description': descripci�."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - mostra l'etiqueta 'summary': resum."
 
-#: ../urpmf_.c:54
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - mostra l'etiqueta 'size': mida."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - mostra l'etiqueta 'size': mida."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - mostra l'etiqueta 'group': grup."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -u             - elimina el paquet si ja hi ha instal�lada una versi� "
-"millor.\n"
+"  --name          - mostra l'etiqueta 'name': nom del fitxer rpm (suposant "
+"que no s'ha indicat cap etiqueta a"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - mostra totes les etiquetes."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - no mostris el nom de l'etiqueta (per defecte si no "
+"s'indica cap etiqueta a la l�nia"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  -u             - elimina el paquet si ja hi ha instal�lada una versi� "
-"millor.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - mode detallat.\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  -a             - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
+"  --synthesis    - utilitza la s�ntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  -a             - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - utilitza nom�s els suports llistats amb comes.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - utilitza nom�s els suports d'actualitzaci�.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"usage: urpmi.addmedia [opcions] <nom> <url> [with <cam�_relatiu>]\n"
-"on <url> �s un dels seg�ents:\n"
-"       file://<cam�>\n"
-"       ftp://<entrada>:<contrasenya>@<ordinador_central>/<cam�> with <nom "
-"relatiu del fitxer hdlist>\n"
-"       ftp://<ordinador_central>/<cam�> with <nom relatiu del fitxer "
-"hdlist>\n"
-"       http://<ordinador_central>/<cam�> with <nom relatiu del fitxer "
-"hdlist>\n"
-"       removable://<cam�>\n"
+"urpmq versi� %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU.\n"
 "\n"
-"i [opcions] son des de\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         - usa wget per a recuperar fitxers llunyans.\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         - use curl per a recuperar fitxers llunyans.\n"
+"sintaxi:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "ja est� tot instal�lat"
 
-#: ../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        - utilitza el proxy HTTP especificat, el n�mero de port "
-"s'assumeix\n"
-"                   que �s el 1080 per defecte (el format �s "
-"<ordinadorcentralproxy[:port]>).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "La instal�laci� �s possible"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - especifica l'usuari i la contrasenya per a utilitzar la "
-"autenticaci�\n"
-"                   del proxy (el format �s <usuari:contrasenya>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "La instal�laci� ha fallat"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea un suport d'actualitzaci�.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Voleu intentar la insta�laci� encara amb m�s for�a (--force)? (s/N) "
 
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
-"  --distrib      - autom�ticament crea tots els suports des d'un suport "
-"d'instal�laci�.\n"
+"Voleu intentar la instal�laci� sense comprovar les depend�ncies? (s/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 ""
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "s'est� distribuint %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --env          - utilitza un entorn concret (normalment un\n"
-"                   informe d'errors).\n"
+"La instal�laci� ha fallat, no s'han trobat alguns fitxers.\n"
+"Potser voleu actualitzar la base de dades urpmi"
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Voleu continuar la instal�laci� ?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - buida el directori de mem�ria cau de cap�aleres.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Els paquets seg�ents tenen signatures incorrectes"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - intenta trobar i utilitzar una s�ntesi o fitxer hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Premeu Intro quan estigui fet..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - imposa la generaci� de fitxers hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Si us plau, inseriu el suport anomenat \"%s\" al dispositiu [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "no es poden recuperar els paquets font. S'est� interrompent"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"no fa falta proporcionar el <cam� relatiu de l'hdlist> amb --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "no es pot actualitzar el suport \"%s\"\n"
+"Per complir les depend�ncies, s'instal�laran els paquets seg�ents (%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Es necessita ser 'root' per a instal�lar les seg�ents depend�ncies:\n"
 "%s\n"
-"falta el <cam� relatiu de l'hdlist>\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 ""
+"Els paquets seg�ents s'han d'eliminar per poder actualitzar uns altres:\n"
 "%s\n"
-"falta el `with' per als suports FTP\n"
+"Hi esteu d'acord ?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "no es pot crear el suport \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "unrequested"
 msgstr ""
-"sintaxi: urpmi.removemedia [-a] <nom> ...\n"
-"on <nom> �s el nom del suport a eliminar.\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selecciona tots els suports.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "%s conflicteix amb %s"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "no es troba wget\n"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"\n"
-"opcions desconegudes '%s'\n"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"no hi ha res per eliminar (utilitzeu urpmi.addmedia per afegir un suport)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "no s'ha pogut instal�lar el paquet %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 ""
-"falta l'entrada per a eliminar\n"
-"(una de %s)\n"
+"Alguns paquets seleccionats no es poden instal�lar:\n"
+"%s\n"
+"Hi esteu d'acord ?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"sintaxi: urpmi.update [opcions] <nom> ...\n"
-"on <nom> �s el nom del suport a actualizar.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Elecci� incorrecta, torneu-ho a provar\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - utilitza nom�s els suports d'actualitzaci�.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Quina �s la vostra elecci�? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - selecciona tots els suports no extra�bles.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Cal un dels paquets seg�ents:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - for�a la computaci� completa del fitxer depslist."
-"ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Un dels paquets seg�ents necessita ser instal�lat %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir un "
-"suport)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "El superusuari �s l'�nic autoritzat per a instal�lar paquets"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"falta l'entrada per actualitzar\n"
-"(una de %s)\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 "No s'ha pogut crear el directori [%s] per a l'informe d'errors"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"urpmi versi� %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
-"GNU.\n"
-"\n"
-"sintaxi:\n"
 
-#: ../urpmi_.c:75
-#, fuzzy
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: opci� desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  --synthesis    - utilitza la s�ntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --auto-select  - selecciona autom�ticament els paquets per actualitzar el "
-"sistema.\n"
+"  els noms o fitxers rpm subsministrats en la l�nia d'ordres estan "
+"instal�lats.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - utilitza recerca difusa (igual que -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode detallat.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - el paquet seg�ent �s un paquet font (igual que -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode silenci�s.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
+"  -s             - el seg�ent paquet �s paquet font (igual que --src).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - esborra els rpm de la mem�ria cau abans de res m�s.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - for�a una cerca 'fuzzy' (igual que --fuzzy).\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
-"  --noclean      - conserva els rpm que no s'utilitzen a la mem�ria cau.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - no busquis en 'provides' per a trobar paquets.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --force        - for�a execuci� tot i que hi hagi paquets que no "
-"existeixen.\n"
+"  -p             - permet la cerca al fitxer 'providers' per a trobar "
+"paquets.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --allow-nodeps - permet de preguntar a l'usuari si vol instal�lar paquets "
-"sense\n"
-"                   comprovar les depend�ncies.\n"
+"  -a             - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --media        - utilitza nom�s els suports llistats amb comes.\n"
+
+#: ../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  - permet de preguntar a l'usuari si vol instal�lar paquets "
-"sense\n"
-"                   comprovar les depend�ncies i la integritat.\n"
+"  --verify-rpm   - verifica la signatura rpm abans de la instal�laci�\n"
+"                   (--no-verify-rpm la deshabilita, defecte �s habilita).\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          - sortida d'un informe d'errors en el directori\n"
-"                   que s'indica en l'argument seg�ent.\n"
+"  --best-output  - escull la millor interf�cie d'acord amb l'entorn:\n"
+"                   el mode X o de text.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - utilitza l'interf�cie X.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1203,465 +1298,498 @@ msgstr ""
 "  --env          - utilitza un entorn concret (normalment un\n"
 "                   informe d'errors).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - utilitza l'interf�cie X.\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  - escull la millor interf�cie d'acord amb l'entorn:\n"
-"                   el mode X o de text.\n"
+"  --bug          - sortida d'un informe d'errors en el directori\n"
+"                   que s'indica en l'argument seg�ent.\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   - verifica la signatura rpm abans de la instal�laci�\n"
-"                   (--no-verify-rpm la deshabilita, defecte �s habilita).\n"
-
-#: ../urpmi_.c:106
-#, fuzzy
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --media        - utilitza nom�s els suports llistats amb comes.\n"
+"  --proxy-user   - especifica l'usuari i la contrasenya per a utilitzar la "
+"autenticaci�\n"
+"                   del proxy (el format �s <usuari:contrasenya>).\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\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 ""
-"  -a             - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
+"  --proxy        - utilitza el proxy HTTP especificat, el n�mero de port "
+"s'assumeix\n"
+"                   que �s el 1080 per defecte (el format �s "
+"<ordinadorcentralproxy[:port]>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
-"  -p             - permet la cerca al fitxer 'providers' per a trobar "
-"paquets.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - no busquis en 'provides' per a trobar paquets.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - use curl per a recuperar fitxers llunyans.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - for�a una cerca 'fuzzy' (igual que --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget per a recuperar fitxers llunyans.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -s             - el seg�ent paquet �s paquet font (igual que --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mode silenci�s.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode detallat.\n"
+"  --allow-force  - permet de preguntar a l'usuari si vol instal�lar paquets "
+"sense\n"
+"                   comprovar les depend�ncies i la integritat.\n"
 
-#: ../urpmi_.c:114
-#, fuzzy
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  els noms o fitxers rpm subsministrats en la l�nia d'ordres estan "
-"instal�lats.\n"
+"  --allow-nodeps - permet de preguntar a l'usuari si vol instal�lar paquets "
+"sense\n"
+"                   comprovar les depend�ncies.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opci� desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
+"  --force        - for�a execuci� tot i que hi hagi paquets que no "
+"existeixen.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "No s'ha pogut crear el directori [%s] per a l'informe d'errors"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr ""
+"  --noclean      - conserva els rpm que no s'utilitzen a la mem�ria cau.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
+"  --clean        - esborra els rpm de la mem�ria cau abans de res m�s.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "El superusuari �s l'�nic autoritzat per a instal�lar paquets"
-
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Un dels paquets seg�ents necessita ser instal�lat %s:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Cal un dels paquets seg�ents:"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Quina �s la vostra elecci�? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - el paquet seg�ent �s un paquet font (igual que -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Elecci� incorrecta, torneu-ho a provar\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - utilitza recerca difusa (igual que -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Alguns paquets seleccionats no es poden instal�lar:\n"
-"%s\n"
-"Hi esteu d'acord ?"
+"  --auto-select  - selecciona autom�ticament els paquets per actualitzar el "
+"sistema.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "no s'ha pogut instal�lar el paquet %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utilitza la s�ntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
+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 versi� %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU.\n"
+"\n"
+"sintaxi:\n"
 
-#: ../urpmi_.c:409
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "no es troba wget\n"
-
-#: ../urpmi_.c:414
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s conflicteix amb %s"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "no es pot actualitzar el suport \"%s\"\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "no es pot crear el suport \"%s\"\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 ""
-"Els paquets seg�ents s'han d'eliminar per poder actualitzar uns altres:\n"
 "%s\n"
-"Hi esteu d'acord ?"
+"falta el `with' per als suports FTP\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Per complir les depend�ncies, s'instal�laran els paquets seg�ents (%d MB)"
+"%s\n"
+"falta el <cam� relatiu de l'hdlist>\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 ""
-"Es necessita ser 'root' per a instal�lar les seg�ents depend�ncies:\n"
 "%s\n"
+"no fa falta proporcionar el <cam� relatiu de l'hdlist> amb --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "no es poden recuperar els paquets font. S'est� interrompent"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "s'estan recuperant els fitxers rpm..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"opcions desconegudes '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Si us plau, inseriu el suport anomenat \"%s\" al dispositiu [%s]"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - imposa la generaci� de fitxers hdlist.\n"
 
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Premeu Intro quan estigui fet..."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - intenta trobar i utilitzar una s�ntesi o fitxer hdlist.\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Els paquets seg�ents tenen signatures incorrectes"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - buida el directori de mem�ria cau de cap�aleres.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Voleu continuar la instal�laci� ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (s/N) "
+#: ../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 ""
 
-#: ../urpmi_.c:548
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"La instal�laci� ha fallat, no s'han trobat alguns fitxers.\n"
-"Potser voleu actualitzar la base de dades urpmi"
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "La instal�laci� ha fallat"
+"  --env          - utilitza un entorn concret (normalment un\n"
+"                   informe d'errors).\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "s'est� distribuint %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
+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 ""
-"Voleu intentar la instal�laci� sense comprovar les depend�ncies? (s/N) "
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Voleu intentar la insta�laci� encara amb m�s for�a (--force)? (s/N) "
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - autom�ticament crea tots els suports des d'un suport "
+"d'instal�laci�.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "ja est� tot instal�lat"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - crea un suport d'actualitzaci�.\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 versi� %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
-"GNU.\n"
+"usage: urpmi.addmedia [opcions] <nom> <url> [with <cam�_relatiu>]\n"
+"on <url> �s un dels seg�ents:\n"
+"       file://<cam�>\n"
+"       ftp://<entrada>:<contrasenya>@<ordinador_central>/<cam�> with <nom "
+"relatiu del fitxer hdlist>\n"
+"       ftp://<ordinador_central>/<cam�> with <nom relatiu del fitxer "
+"hdlist>\n"
+"       http://<ordinador_central>/<cam�> with <nom relatiu del fitxer "
+"hdlist>\n"
+"       removable://<cam�>\n"
 "\n"
-"sintaxi:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - llista els paquets disponibles.\n"
+"i [opcions] son des de\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - llista els suports disponibles.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"falta l'entrada per a eliminar\n"
+"(una de %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"  --list-nodes   - llista els nodes disponibles quan s'utilitza --parallel.\n"
+"no hi ha res per eliminar (utilitzeu urpmi.addmedia per afegir un suport)\n"
 
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-media   - llista els suports disponibles.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selecciona tots els suports.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - extreu cap�aleres del paquet llistats des de urpmi db a\n"
-"                   'stdout' (nom�s 'root').\n"
+"sintaxi: urpmi.removemedia [-a] <nom> ...\n"
+"on <nom> �s el nom del suport a eliminar.\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      - d�na tots els paquets font abans de la baixada (nom�s "
-"'root').\n"
+"falta l'entrada per actualitzar\n"
+"(una de %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - amplia la cerca a les depend�ncies dels paquets.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir un "
+"suport)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - esborra paquet si hi ha instal�lada una versi� m�s nova.\n"
+"  -d             - for�a la computaci� completa del fitxer depslist."
+"ordered.\n"
 
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    la l�nia d'ordres per� sense el nom del paquet)."
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - selecciona tots els suports no extra�bles.\n"
 
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - utilitza nom�s els suports d'actualitzaci�.\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  -p             - permet la cerca al fitxer 'providers' per a trobar "
-"paquets.\n"
+"sintaxi: urpmi.update [opcions] <nom> ...\n"
+"on <nom> �s el nom del suport a actualizar.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - imprimeix grups amb el nom.\n"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--synthesis no es pot usar amb --media, --update o --parallel"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
-"  -r             - mostra la versi� i llan�ament juntament amb el nom.\n"
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: opci� desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
+
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  s�n necessaris els noms o els fitxers rpm indicats a la l�nia d'ordres.\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--synthesis no es pot usar amb --media, --update o --parallel"
-
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versi� %s"
+msgid "  -r             - print version and release with name also.\n"
+msgstr ""
+"  -r             - mostra la versi� i llan�ament juntament amb el nom.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - imprimeix grups amb el nom.\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
-"GNU."
+"  -p             - permet la cerca al fitxer 'providers' per a trobar "
+"paquets.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "sintaxi: urpmf [opcions] <fitxer>"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    la l�nia d'ordres per� sense el nom del paquet)."
 
-#: placeholder.h:22
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --quiet         - no mostris el nom de l'etiqueta (per defecte si no "
-"s'indica cap etiqueta a la l�nia"
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    d'ordres, incompatible amb el mode interactiu)."
+"  -u             - esborra paquet si hi ha instal�lada una versi� m�s nova.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - mostra totes les etiquetes."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - amplia la cerca a les depend�ncies dels paquets.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --name          - mostra l'etiqueta 'name': nom del fitxer rpm (suposant "
-"que no s'ha indicat cap etiqueta a"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    la l�nia d'ordres per� sense el nom del paquet)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - mostra l'etiqueta 'group': grup."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - mostra l'etiqueta 'size': mida."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - mostra l'etiqueta 'serial': s�rie."
+"  --sources      - d�na tots els paquets font abans de la baixada (nom�s "
+"'root').\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - mostra l'etiqueta 'summary': resum."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - extreu cap�aleres del paquet llistats des de urpmi db a\n"
+"                   'stdout' (nom�s 'root').\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - mostra l'etiqueta 'description': descripci�."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-media   - llista els suports disponibles.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --provides      - mostra l'etiqueta 'provides': tots els "
-"'provides' (l�nies m�ltiples)."
+"  --list-nodes   - llista els nodes disponibles quan s'utilitza --parallel.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr ""
-"  --requires      - mostra l'etiqueta 'requires': tots els "
-"'requires' (l�nies m�ltiples)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - llista els suports disponibles.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --files         - mostra l'etiqueta 'files': tots els fitxers (l�nies "
-"m�ltiples)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - llista els paquets disponibles.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (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 ""
-"  --conflicts     - mostra l'etiqueta 'conflicts': tots els conflictes "
-"(l�nies m�ltiples)."
+"urpmq versi� %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU.\n"
+"\n"
+"sintaxi:\n"
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr ""
-"  --obsoletes     - mostra l'etiqueta 'obsoletes': tots els obsolets (l�nies "
-"m�ltiples)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "La instal�laci� ha fallat en el node %s"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
-"  --prereqs       - mostra l'etiqueta 'prereqs': tots els 'prereqs' (l�nies "
-"m�ltiples)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "proveu urpmf --help per veure m�s opcions"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "no s'ha trobat cap llista de suports completa"
-
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl ha fallat: s'ha sortit amb %d o senyal %d\n"
-
-#~ msgid "rsync is missing\n"
-#~ msgstr "no s'ha trobat rsync\n"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync ha fallat: s'ha sortit amb %d o senyal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "falta ssh\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "error de sintaxi en fitxer de configuraci� a la l�nia %s"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "La instal�laci� ha fallat en el node %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "el suport \"%s\" ha provat d'utilitzar un hdlist en �s, suport ignorat"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "ordinador central %s no t� una bona versi� de urpmi"
 
 #~ msgid "Remove them all?"
 #~ msgstr "Esborrar-los tots?"
diff --git a/po/cs.po b/po/cs.po
index 48fa324b..10004eb9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-cs\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-03-03 20:54GMT\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,1136 +17,1272 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instaluji %s\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 "AaYy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf verze %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright ©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 ""
-"Automatická instalace balíčků....\n"
-"Zadal jste instalaci balíčku %s\n"
+"Toto je svobodný software a je volně šiřitelný podle podmínek licence GNU "
+"GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Je to správně?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "použití: urpmf [volby] <soubor>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "OK"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet        - nevypíše jméno tagu (výchozí chování, pokud není jméno "
+"tagu"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Zrušit"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
+"                      zadáno na příkazové řádce, opak interaktivního režimu)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - vypíše všechny tagy."
 
-#: ../_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 "AaYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - vypíše tag: jméno rpm souboru (předpokládané, pokud není"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (A/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    zadán na příkazové řádce ale bez jména balíčku)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - vypíše tag skupina: group."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - vypíše tag velikost: size."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - vypíše tag sériové číslo: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - vypíše tag souhrn: summary."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - vypíše tag popis: description."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - vypíše tag poskytuje: all provides (na více řádek)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - vypíše tag vyžaduje: all requires (na více řádek)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - vypíše tag soubory: all files (na více řádek)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - vypíše tag konflikty: all conflicts (na více řádek)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - vypíše tag nahrazuje: all obsoletes (na více řádek)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - vypíše tag prerekvizity: all prereqs (na více řádek)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "zadejte urpmf --help pro získání více voleb"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "nebyl nalezen žádný popis zdroje"
 
-#: ../_irpm_.c:63
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: příkaz nenalezen\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Neznámý webfetch `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (A/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "neznámý protokol definovaný pro %s"
+msgid "Cancel"
+msgstr "Zrušit"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "nebyl nalezen program webfetch (nebo curl či wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nelze zpracovat protokol: %s"
+msgid "Is this OK?"
+msgstr "Je to správně?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kopírování selhalo: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automatická instalace balíčků....\n"
+"Zadal jste instalaci balíčku %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "chybí program wget\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instaluji %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "příkaz wget selhal: skončil s kódem %d nebo signálem %d\n"
+msgid "unable to open rpmdb"
+msgstr "nelze otevřít databázi rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "chybí program curl\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "nelze zpřístupnit soubor RPM [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "zdroj \"%s\" bude ignorován, pokouší se použít již použitý seznam"
+msgid "%s conflicts with %s"
+msgstr "%s je v konfliktu s %s"
 
-#: ../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 ""
-"nelze pracovat se zdrojem \"%s\", pokud je seznam souborů využíván jiným"
+msgid "%s is needed by %s"
+msgstr "%s je vyžadováno %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nelze použít jméno \"%s\" pro nepojmenovaný zdroj protože to je již použito"
+msgid "unable to install package %s"
+msgstr "nelze nainstalovat balíček %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"pokud neexistuje seznam souborů [%s], nelze zařadit zdroj \"%s\" mezi "
-"používané"
+msgid "unable to remove package %s"
+msgstr "nelze odstranit balíček %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nelze zjistit zdroj pro tento soubor hdlist [%s]"
+msgid "Preparing..."
+msgstr "Připravuji..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
-"zdroj \"%s\" bude ignorován, protože nelze načíst soubor hdlist pro zdroj"
+msgid "...retrieving failed: %s"
+msgstr "...načítání selhalo: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nelze získat seznam souborů pro \"%s\", zdroj bude ignorován"
+msgid "...retrieving done"
+msgstr "...načítání ukončeno"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "načítám soubory RPM..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pokus o vynechání existujícího zdroje \"%s\""
+msgid "malformed input: [%s]"
+msgstr "zkreslený vstup: [%s]"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "nelze nalézt soubor hdlist pro \"%s\", zdroj bude ignorován"
+msgid "unable to access medium \"%s\""
+msgstr "nelze přistoupit na zdroj \"%s\""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nelze najít seznam souborů pro \"%s\", zdroj se ignoruje"
+msgid "urpmi database locked"
+msgstr "databáze pro urpmi je zamknutá"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nesouvislý seznam souborů pro \"%s\", zdroj bude ignorován"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "nesouvislé médium \"%s\" je označeno jako vyjímatelné, ale není"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nelze prozkoumat seznam souborů pro \"%s\", zdroj bude ignorován"
+msgid "medium \"%s\" is not selected"
+msgstr "zdroj \"%s\" není vybrán"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "výměnné médium \"%s\" má příliš mnoho přípojných bodů"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nelze načíst soubor RPM [%s] pro zdroj \"%s\""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "pokládám vyjímatelné médium za \"%s\""
+msgid "package %s is not found."
+msgstr "balíček %s nenalezen"
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "použiji jiné vyjímatelné zařízení [%s] pro \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nelze načíst cestu pro výměnné médium \"%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:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nelze zapsat soubor s nastavením [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "více balíčků má stejný název souboru RPM \"%s\""
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "zapisuji soubor s nastavením [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nelze korektně zpracovat [%s] kvůli hodnotě \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "nelze zpracovat \"%s\" v souboru [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Následující balíčky obsahují: %s: %s"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "zkoumám paralelní zpracování v souboru [%s]"
+msgid "no package named %s"
+msgstr "žádný balíček s názvem %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "nalezeno paralelní zpracování pro uzly: %s"
+msgid "error registering local packages"
+msgstr "chyba při registraci lokálních balíčků"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "používám asociované zdroje pro paralelní režim: %s"
+msgid "unable to register rpm file"
+msgstr "nelze zpřístupnit soubor RPM [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "načítám soubory RPM..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "nelze použít paralelní volbu \"%s\""
+msgid "invalid rpm file name [%s]"
+msgstr "neplatný název souboru RPM [%s]"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr ""
-"volbu --synthesis nelze použít s volbami --media, --update nebo --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr "v souboru depslist nejsou žádné přesunuté položky"
 
-#: ../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 "relocated %s entries in depslist"
+msgstr "přesunuté položky %s v souboru depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "odpojuji %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "připojuji %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "odebírám %d starých hlaviček"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "nalezeno %d hlaviček"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "vytvářím syntézu pro hdlist pro zdroj \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "zpracovávám soubor hdlist [%s]"
 
-#: ../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]"
 msgstr "zpracovávám soubor syntézy [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problém při čtení souboru hdlist zdroje \"%s\""
+msgid "building hdlist [%s]"
+msgstr "vytvářím hdlist [%s]"
 
-#: ../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\""
-msgstr "problém při čtení souboru se syntézou zdroje \"%s\""
+msgid "reading headers from medium \"%s\""
+msgstr "načítám hlavičky ze zdroje \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "nelze otevřít databázi rpmdb"
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "počítám závislosti v druhém průchodu\n"
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "zdroj \"%s\" již existuje"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problém při čtení souboru se syntézou zdroje \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "přidán zdroj %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "není co zapisovat v seznamu souborů pro \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "nelze přistupovat k prvnímu instalačnímu médiu"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "kopíruji soubor hdlists..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "nelze zapsat seznam souborů pro zdroj \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kopírování ukončeno"
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "soubor [%s] je již používán na tomtéž zdroji \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kopírování ukončeno"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nelze zpracovat soubor hdlist pro zdroj \"%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)"
-msgstr ""
-"nelze přistupovat k prvnímu instalačnímu médiu (chybí soubor Mandrake/base/"
-"hdlists)"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "načítám soubor hdlists..."
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "načítání zdrojového souboru hdlist (nebo souboru se syntézou) selhalo"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...načítání ukončeno"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "zpracovávám soubor hdlist [%s]"
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "kopíruji zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...načítání selhalo: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "načítám zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "špatný popis hdlist \"%s\" v souboru hdlists"
+msgid "retrieving description file of \"%s\"..."
+msgstr "načítám soubor s popisy pro \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "nelze vybrat neexistující zdroj \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nebyl nalezen žádný soubor RPM na [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nelze číst soubory RPM z [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "vybírám více zdrojů: %s"
+msgid "reading rpm files from [%s]"
+msgstr "načítám soubory RPM z [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "odebírám zdroj \"%s\""
+msgid "...copying done"
+msgstr "...kopírování ukončeno"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "databáze pro urpmi je zamknutá"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...kopírování ukončeno"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nelze přistoupit na zdroj \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "kopíruji zdrojový seznam pro \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopíruji soubor s popisy pro \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "kopírování [%s] selhalo"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopíruji zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "kopírování [%s] selhalo"
+msgid "copying description file of \"%s\"..."
+msgstr "kopíruji soubor s popisy pro \"%s\"..."
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "zpracovávám soubor hdlist [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "odebírám zdroj \"%s\""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopíruji zdrojový seznam pro \"%s\"..."
+msgid "selecting multiple media: %s"
+msgstr "vybírám více zdrojů: %s"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "načítám soubory RPM z [%s]"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "nelze číst soubory RPM z [%s]: %s"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "nelze vybrat neexistující zdroj \"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nebyl nalezen žádný soubor RPM na [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"nelze přistupovat k prvnímu instalačnímu médiu (chybí soubor Mandrake/base/"
+"hdlists)"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "načítám soubor s popisy pro \"%s\"..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "špatný popis hdlist \"%s\" v souboru hdlists"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "načítám zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
+msgid "retrieving hdlists file..."
+msgstr "načítám soubor hdlists..."
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "načítání zdrojového souboru hdlist (nebo souboru se syntézou) selhalo"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying hdlists file..."
+msgstr "kopíruji soubor hdlists..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
+msgid "unable to access first installation medium"
+msgstr "nelze přistupovat k prvnímu instalačnímu médiu"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "soubor [%s] je již používán na tomtéž zdroji \"%s\""
+msgid "added medium %s"
+msgstr "přidán zdroj %s"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "nelze zpracovat soubor hdlist pro zdroj \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "zdroj \"%s\" již existuje"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "nelze zapsat seznam souborů pro zdroj \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problém při čtení souboru hdlist zdroje \"%s\""
 
-#: ../urpm.pm_.c:1526
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
+"volbu --synthesis nelze použít s volbami --media, --update nebo --parallel"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "není co zapisovat v seznamu souborů pro \"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "nelze použít paralelní volbu \"%s\""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "počítám závislosti v druhém průchodu\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "používám asociované zdroje pro paralelní režim: %s"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "načítám hlavičky ze zdroje \"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr "nalezeno paralelní zpracování pro uzly: %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "vytvářím hdlist [%s]"
+msgid "examining parallel handler in file [%s]"
+msgstr "zkoumám paralelní zpracování v souboru [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "vytvářím syntézu pro hdlist pro zdroj \"%s\""
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "nelze zpracovat \"%s\" v souboru [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "nalezeno %d hlaviček"
+msgid "write config file [%s]"
+msgstr "zapisuji soubor s nastavením [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "odebírám %d starých hlaviček"
+msgid "unable to write config file [%s]"
+msgstr "nelze zapsat soubor s nastavením [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "připojuji %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nelze načíst cestu pro výměnné médium \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "odpojuji %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "použiji jiné vyjímatelné zařízení [%s] pro \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "přesunuté položky %s v souboru depslist"
+msgid "taking removable device as \"%s\""
+msgstr "pokládám vyjímatelné médium za \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "v souboru depslist nejsou žádné přesunuté položky"
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "výměnné médium \"%s\" má příliš mnoho přípojných bodů"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "neplatný název souboru RPM [%s]"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nelze prozkoumat seznam souborů pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "načítám soubory RPM..."
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nesouvislý seznam souborů pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "nelze zpřístupnit soubor RPM [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nelze najít seznam souborů pro \"%s\", zdroj se ignoruje"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "nelze zpřístupnit soubor RPM [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "nelze nalézt soubor hdlist pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "chyba při registraci lokálních balíčků"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pokus o vynechání existujícího zdroje \"%s\""
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "žádný balíček s názvem %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "nelze získat seznam souborů pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Následující balíčky obsahují: %s: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
+"zdroj \"%s\" bude ignorován, protože nelze načíst soubor hdlist pro zdroj"
 
-#: ../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\""
-msgstr "více balíčků má stejný název souboru RPM \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nelze zjistit zdroj pro tento soubor hdlist [%s]"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nelze korektně zpracovat [%s] kvůli hodnotě \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"pokud neexistuje seznam souborů [%s], nelze zařadit zdroj \"%s\" mezi "
+"používané"
 
-#: ../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 "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
+"nelze použít jméno \"%s\" pro nepojmenovaný zdroj protože to je již použito"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"nelze pracovat se zdrojem \"%s\", pokud je seznam souborů využíván jiným"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "balíček %s nenalezen"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "zdroj \"%s\" bude ignorován, pokouší se použít již použitý seznam"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "zdroj \"%s\" není vybrán"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"zdroj \"%s\" bude ignorován, pokouší se použít již použitý soubor hdlist"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nelze načíst soubor RPM [%s] pro zdroj \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "syntaktická chyba v souboru s nastavením na řádku %s"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "nesouvislé médium \"%s\" je označeno jako vyjímatelné, ale není"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% dokončeno, rychlost = %s"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "zkreslený vstup: [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% z %s dokončeno, ETA = %s, rychlost = %s"
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "načítám soubory RPM..."
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "příkaz rsync selhal: skončil s kódem %d nebo signálem %d\n"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Připravuji..."
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "chybí program ssh\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "nelze odstranit balíček %s"
+msgid "rsync is missing\n"
+msgstr "chybí program rsync\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "nelze nainstalovat balíček %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "příkaz curl selhal: skončil s kódem %d nebo signálem %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s je vyžadováno %s"
+msgid "curl is missing\n"
+msgstr "chybí program curl\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s je v konfliktu s %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "příkaz wget selhal: skončil s kódem %d nebo signálem %d\n"
 
-#: ../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 selhalo, možná není uzel k dispozici"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr "chybí program wget\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 selhalo, možná není uzel k dispozici"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "kopírování selhalo: %s"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "na uzlu %s"
+msgid "unable to handle protocol: %s"
+msgstr "nelze zpracovat protokol: %s"
 
-#: ../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 "Instalace selhala na uzlu %s"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "nebyl nalezen program webfetch (nebo curl či wget)\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 "Instalace je možná"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "neznámý protokol definovaný pro %s"
 
-#: ../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 "selhalo scp na počítači %s"
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Neznámý webfetch `%s' !!!\n"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpme:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "počítač %s nemá správnou verzi programu urpmi"
+msgid "Removing failed"
+msgstr "Odebírání selhalo"
 
-#: ../urpme_.c:39
+#: ../urpme: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"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"urpme verze %s\n"
-"Copyright ©1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
-"GPL.\n"
-"\n"
-"použití:\n"
-
-#: ../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           - vypíše tuto nápovědu.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto       - automaticky vybere balíček z výběru.\n"
-
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - zkontrolovat, zda lze dokončit instalaci správně.\n"
+"Aby byly splněny závislosti, budou odebrány následující balíčky (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
-"  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Kontrola odebrání následujících balíčků"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - vybere všechny balíčky vyhovující výrazu.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Není co odebrat"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: neznámá volba \"-%s\", způsob použití vyvoláte zadáním --help\n"
+msgid "removing package %s will break your system"
+msgstr "odebrání balíčku %s naruší funkčnost vašeho systému"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "neznámý balíček"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "neznámé balíčky"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "odebrání balíčku %s naruší funkčnost vašeho systému"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: neznámá volba \"-%s\", způsob použití vyvoláte zadáním --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Není co odebrat"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - vybere všechny balíčky vyhovující výrazu.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Kontrola odebrání následujících balíčků"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
+"  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\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 ""
-"Aby byly splněny závislosti, budou odebrány následující balíčky (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - zkontrolovat, zda lze dokončit instalaci správně.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Odebírání selhalo"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto       - automaticky vybere balíček z výběru.\n"
 
-#: ../urpmf_.c:26
+#: ../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           - vypíše tuto nápovědu.\n"
+
+#: ../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 verze %s\n"
-"Copyright ©2002 MandrakeSoft.\n"
+"urpme verze %s\n"
+"Copyright ©1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
 "GPL.\n"
 "\n"
 "použití:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"zpětné volání je:\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media         - použít pouze uvedené zdroje, oddělené čárkou.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - pravá závorka pro uzavření skupiny výrazů.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - levá závorka pro otevření skupiny výrazů.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - užvaněný režim.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - unární operátor NOT, true pokud výraz neplatí.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet        - nevypíše název tagu (výchozí chování, pokud není název "
-"tagu zadán\n"
-"z příkazové řádky, není kompatibilní s interaktivním režimem).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - vypíše všechny tagy.\n"
+"  -o             - binární operátor OR, true pokud jeden z výrazů platí.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - vypíše název tagu: název rpm souboru (předpokládané, "
-"pokud není\n"
-"                   název tagu zadán na příkazové řádce, ale bez názvu "
-"balíčku).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - vypíše tag skupina: group.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - vypíše tag velikost: size.\n"
+"  -a             - binární operátor AND, true pokud oba výrazy platí.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - vypíše tag epocha: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e           - vloží kód Perl přímo jako perl -e.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - vypíše tag souhrn: summary.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f        - společně se jménem vypíše verzi, vydání a architekturu.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - vypíše tag popis: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - vypíše tag poskytuje: all provides (na více řádek).\n"
+"  --obsoletes     - vypíše tag nahrazuje: all obsoletes (na více řádek).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - vypíše tag vyžaduje: all requires (na více řádek).\n"
+"  --conflicts     - vypíše tag konflikty: all conflicts (na více řádek).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr "  --files         - vypíše tag soubory: all files (na více řádek).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - vypíše tag konflikty: all conflicts (na více řádek).\n"
+"  --requires      - vypíše tag vyžaduje: all requires (na více řádek).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - vypíše tag nahrazuje: all obsoletes (na více řádek).\n"
+"  --provides      - vypíše tag poskytuje: all provides (na více řádek).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - vypíše tag popis: description.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f        - společně se jménem vypíše verzi, vydání a architekturu.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - vypíše tag souhrn: summary.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e           - vloží kód Perl přímo jako perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - vypíše tag epocha: epoch.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - vypíše tag velikost: size.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - vypíše tag skupina: group.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - binární operátor AND, true pokud oba výrazy platí.\n"
+"  --name          - vypíše název tagu: název rpm souboru (předpokládané, "
+"pokud není\n"
+"                   název tagu zadán na příkazové řádce, ale bez názvu "
+"balíčku).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - vypíše všechny tagy.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - binární operátor OR, true pokud jeden z výrazů platí.\n"
+"  --quiet        - nevypíše název tagu (výchozí chování, pokud není název "
+"tagu zadán\n"
+"z příkazové řádky, není kompatibilní s interaktivním režimem).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - unární operátor NOT, true pokud výraz neplatí.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - užvaněný režim.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - levá závorka pro otevření skupiny výrazů.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - pravá závorka pro uzavření skupiny výrazů.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media         - použít pouze uvedené zdroje, oddělené čárkou.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"zpětné volání je:\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"použití: urpmi.addmedia [volby] <jméno> <url> [s <relativní_cestou>]\n"
-"kde <url> je jedno z následujících\n"
-"      file://<cesta>\n"
-"      ftp://<login>:<heslo>@<host>/<cesta> s <relativním jménem souboru "
-"hdlistu>\n"
-"      ftp://<host>/<cesta> s <relativním jménem souboru hdlist>\n"
-"      http://<host>/<cesta> s <relativním jménem souboru hdlist>\n"
-"      removable://<cesta>\n"
+"urpmf verze %s\n"
+"Copyright ©2002 MandrakeSoft.\n"
+"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
+"GPL.\n"
 "\n"
-"a [volby] jsou z\n"
+"použití:\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          - použije program wget pro načtení souborů.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "vše je již nainstalováno"
 
-#: ../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         - použije program curl pro načtení souborů.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalace je možná"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - omezení rychlosti stahování.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Chyba při instalaci"
 
-#: ../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        - použij zadanou HTTP proxy, číslo portu se předpokládá\n"
-"                   1080, jako výchozí (formát je <proxyhost[:port]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - uživatel a heslo, které se má použít u ověření\n"
-"                   proxy (formát je <uživatel:heslo>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - vytvoří zdroj pro aktualizaci.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distribuuji %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --distrib      - automaticky vytvoří všechny zdroje z instalačního\n"
-"                   média.\n"
+"Instalace selhala, některé soubory chybí:\n"
+"%s\n"
+"Možná potřebujete aktualizovat vaši databázi urpmi"
 
-#: ../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  - automaticky vytvoří médium pro část XXX\n"
-"                   distribuce, XXX může být main, contrib, updates nebo\n"
-"                   cokoli jiného co je nastaveno ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (a/N) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - pro seznam zrcadel se použije zadané URL, výchozí je\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
+msgstr "Chcete pokračovat v instalaci?"
 
-#: ../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"
-msgstr ""
-"  --version      - použije se zadaná verze distribuce, výchozí verze je "
-"převzata\n"
-"                   z verze instalovaného balíčku mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Následující balíčky mají špatné signatury"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - použije se zadaná architektura, výchozí je arch.\n"
-"                   balíčku mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Stiskněte klávesu Enter až budete připraveni..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c           - smaže dočasný adresář.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Prosím vložte médium nazvané \"%s\" do zařízení [%s]"
 
-#: ../urpmi.addmedia_.c:75
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "nelze získat zdrojový balíček, končím"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"  -h        - provede pokus o nalezení souboru hdlist\n"
-"                   nebo souboru se syntézou.\n"
-
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f         - provede generování hdlist souborů.\n"
-
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nelze přidat aktualizace pro distribuci Cooker\n"
+"Aby byly splněny závislosti, budou nainstalovány následující balíčky (%d MB)"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"Pro instalaci následujících závislostí potřebujete mít právo root:\n"
 "%s\n"
-"s volbou --distrib není třeba zadávat <relativní cesta k hdlistu>"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nelze aktualizovat zdroj \"%s\"\n"
-
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
 "%s\n"
-"<relativní cesta k hdlistu> chybí\n"
+"Souhlasíte?"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr "nevyžádán"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "z důvodu konfliktů s %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "z důvodu chybějícího %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "z důvodu nesplněného %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "pro instalaci %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"Některé vyžádané balíčky nebylo možné nainstalovat:\n"
 "%s\n"
-" chybí `with' pro FTP zdroj\n"
+"Souhlasíte?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nelze vytvořit zdroj \"%s\"\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Je mi líto, to je špatná volba. Zkuste to znovu\n"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"použití: urpmi.removemedia [-a] <jméno> ...\n"
-"kde <jméno> je název zdroje pro aktualizaci.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Jaká je vaše volba? (1-%d) "
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a           - vybere všechna média.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Je zapotřebí jeden z následujících balíčků:"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "One of the following packages is needed to install %s:"
 msgstr ""
-"\n"
-"neznámé volby '%s'\n"
+"Pro instalaci %s je zapotřebí nainstalovat jeden z následujících balíčků:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nic k odebrání (použijte urpmi.addmedia pro přidání zdroje)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Instalovat balíčky může pouze uživatel root"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"záznam pro odebrání chybí\n"
-"(jeden z %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "používá se specifické prostředí na %s\n"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"použití: urpmi.update [volby] <jméno> ...\n"
-"kde <jméno> je název zdroje pro aktualizaci.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Nelze vytvořit adresář [%s] pro uložení hlášení o chybě"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - aktualizovat pouze aktualizační zdroje.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Co lze učinit s binárními soubory RPM při použití --install-src"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a           - vybere všechna nevyjímatelná média.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: neznámá volba \"%s\", způsob použití vyvoláte zadáním --help\n"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  -d           - provede kompletní generování souboru depslists.ordered.\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nic k aktualizaci (použijte urpmi.addmedia pro přidání zdroje)\n"
-
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"záznam pro update chybí\n"
-"(jeden z %s)\n"
+"  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1 ../urpmq: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"
-msgstr ""
-"urpmi verze %s\n"
-"Copyright ©1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Toto je svobodný software a je volně šiřitelný podle podmínek licence GNU "
-"GPL.\n"
-"\n"
-"použití:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - režim s výpisy.\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q           - režim bez výpisů.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s              - další balíček je zdrojový (stejné jako --src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy          - vnutit fuzzy vyhledávání. (stejné jako -y)\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - vnutit fuzzy vyhledávání (stejné jako --fuzzy).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - další balíček je zdrojový (stejné jako -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - nehledá balíček v položkách provides.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - instalovat pouze balíček se zdroji (bez binárních "
-"souborů).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p           - pokusí se najít balíček v položkách provides.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - vybere všechny vyhovující z příkazové řádky.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - udržuje nepoužívané rpm v cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - nebrat v úvahu cestu oddělenou čárkami.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force       - spustí program i v případě, že některé balíčky chybí.\n"
+"  --verify-rpm   - zkontroluje před instalací signaturu balíčku RPM\n"
+"                   (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - povolí žádost na uživatele, aby instaloval balíčky bez\n"
-"                   kontroly závislostí.\n"
+"  --best-output  - vybere takový výstup, který odpovídá prostředí:\n"
+"                          grafický nebo textový režim.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X           - použije X prostředí.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --allow-force  - povolí žádost na uživatele, aby instaloval balíčky bez\n"
-"                   kontroly závislostí a integrity.\n"
+"  --env          - použij specifické prostředí (většinou hlášení\n"
+"                   o chybě).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1154,453 +1290,483 @@ msgstr ""
 "  --bug          - vygeneruje hlášení o chybě do adresáře \n"
 "                   zadaného následujícím parametrem.\n"
 
-#: ../urpmi_.c:98
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - použij specifické prostředí (většinou hlášení\n"
-"                   o chybě).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X           - použije X prostředí.\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --best-output  - vybere takový výstup, který odpovídá prostředí:\n"
-"                          grafický nebo textový režim.\n"
+"  --proxy-user   - uživatel a heslo, které se má použít u ověření\n"
+"                   proxy (formát je <uživatel:heslo>).\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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --verify-rpm   - zkontroluje před instalací signaturu balíčku RPM\n"
-"                   (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - nebrat v úvahu cestu oddělenou čárkami.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - vybere všechny vyhovující z příkazové řádky.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p           - pokusí se najít balíček v položkách provides.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - nehledá balíček v položkách provides.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - vnutit fuzzy vyhledávání (stejné jako --fuzzy).\n"
+"  --proxy        - použij zadanou HTTP proxy, číslo portu se předpokládá\n"
+"                   1080, jako výchozí (formát je <proxyhost[:port]>).\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s              - další balíček je zdrojový (stejné jako --src).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - omezení rychlosti stahování.\n"
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q           - režim bez výpisů.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - použije program curl pro načtení souborů.\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - režim s výpisy.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget          - použije program wget pro načtení souborů.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
+"  --allow-force  - povolí žádost na uživatele, aby instaloval balíčky bez\n"
+"                   kontroly závislostí a integrity.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: neznámá volba \"%s\", způsob použití vyvoláte zadáním --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Co lze učinit s binárními soubory RPM při použití --install-src"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - povolí žádost na uživatele, aby instaloval balíčky bez\n"
+"                   kontroly závislostí.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nelze vytvořit adresář [%s] pro uložení hlášení o chybě"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force       - spustí program i v případě, že některé balíčky chybí.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "používá se specifické prostředí na %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Instalovat balíčky může pouze uživatel root"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - udržuje nepoužívané rpm v cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
-"Pro instalaci %s je zapotřebí nainstalovat jeden z následujících balíčků:"
+"  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Je zapotřebí jeden z následujících balíčků:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - instalovat pouze balíček se zdroji (bez binárních "
+"souborů).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Jaká je vaše volba? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - další balíček je zdrojový (stejné jako -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Je mi líto, to je špatná volba. Zkuste to znovu\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy          - vnutit fuzzy vyhledávání. (stejné jako -y)\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Některé vyžádané balíčky nebylo možné nainstalovat:\n"
-"%s\n"
-"Souhlasíte?"
+"  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "pro instalaci %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "z důvodu nesplněného %s"
+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 verze %s\n"
+"Copyright ©1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Toto je svobodný software a je volně šiřitelný podle podmínek licence GNU "
+"GPL.\n"
+"\n"
+"použití:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "z důvodu chybějícího %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nelze aktualizovat zdroj \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "z důvodu konfliktů s %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "nevyžádán"
+msgid "unable to create medium \"%s\"\n"
+msgstr "nelze vytvořit zdroj \"%s\"\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 ""
-"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
 "%s\n"
-"Souhlasíte?"
+" chybí `with' pro FTP zdroj\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Aby byly splněny závislosti, budou nainstalovány následující balíčky (%d MB)"
+"%s\n"
+"<relativní cesta k hdlistu> chybí\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 ""
-"Pro instalaci následujících závislostí potřebujete mít právo root:\n"
 "%s\n"
+"s volbou --distrib není třeba zadávat <relativní cesta k hdlistu>"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "nelze získat zdrojový balíček, končím"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "načítám soubory RPM..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% z %s dokončeno, ETA = %s, rychlost = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nelze přidat aktualizace pro distribuci Cooker\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% dokončeno, rychlost = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"neznámé volby '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Prosím vložte médium nazvané \"%s\" do zařízení [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Stiskněte klávesu Enter až budete připraveni..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Následující balíčky mají špatné signatury"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f         - provede generování hdlist souborů.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Chcete pokračovat v instalaci?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h        - provede pokus o nalezení souboru hdlist\n"
+"                   nebo souboru se syntézou.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (a/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c           - smaže dočasný adresář.\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 ""
-"Instalace selhala, některé soubory chybí:\n"
-"%s\n"
-"Možná potřebujete aktualizovat vaši databázi urpmi"
+"  --arch         - použije se zadaná architektura, výchozí je arch.\n"
+"                   balíčku mandrake-release.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Chyba při instalaci"
+#: ../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      - použije se zadaná verze distribuce, výchozí verze je "
+"převzata\n"
+"                   z verze instalovaného balíčku mandrake-release.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distribuuji %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - pro seznam zrcadel se použije zadané URL, výchozí je\n"
+"                   %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
+#: ../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  - automaticky vytvoří médium pro část XXX\n"
+"                   distribuce, XXX může být main, contrib, updates nebo\n"
+"                   cokoli jiného co je nastaveno ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automaticky vytvoří všechny zdroje z instalačního\n"
+"                   média.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "vše je již nainstalováno"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - vytvoří zdroj pro aktualizaci.\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 verze %s\n"
-"Copyright ©2000, 2001, 2002 MandrakeSoft.\n"
-"Toto je svobodný software a je volně šiřitelný podle podmínek licence GNU "
-"GPL.\n"
+"použití: urpmi.addmedia [volby] <jméno> <url> [s <relativní_cestou>]\n"
+"kde <url> je jedno z následujících\n"
+"      file://<cesta>\n"
+"      ftp://<login>:<heslo>@<host>/<cesta> s <relativním jménem souboru "
+"hdlistu>\n"
+"      ftp://<host>/<cesta> s <relativním jménem souboru hdlist>\n"
+"      http://<host>/<cesta> s <relativním jménem souboru hdlist>\n"
+"      removable://<cesta>\n"
 "\n"
-"použití:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - vypíše balíčky, které jsou k dispozici.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - vypíše seznam dostupných zdrojů.\n"
+"a [volby] jsou z\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   - vypíše seznam uzlů k dispozici při použití volby --"
-"parallel.\n"
+"záznam pro odebrání chybí\n"
+"(jeden z %s)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - seznam dostupných paralelních přezdívek.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nic k odebrání (použijte urpmi.addmedia pro přidání zdroje)\n"
+
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a           - vybere všechna média.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - extrahuje hlavičky pro balíček z urpmi db na std.\n"
-"                   výstup.\n"
+"použití: urpmi.removemedia [-a] <jméno> ...\n"
+"kde <jméno> je název zdroje pro aktualizaci.\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 ""
-"  --source     - všechny zdrojové balíčky před stažením (pouze uživatel "
-"root).\n"
+"záznam pro update chybí\n"
+"(jeden z %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d               - rozšířený dotaz na závislosti balíčku.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nic k aktualizaci (použijte urpmi.addmedia pro přidání zdroje)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u          - odebere balíček pokud je již instalována novější verze.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - doplnit výstup balíčkem k odebrání.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverzní vyhledávání požadavků balíčku.\n"
+"  -d           - provede kompletní generování souboru depslists.ordered.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a           - vybere všechna nevyjímatelná média.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r              - společně se jménem vypíše verzi a vydání.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - aktualizovat pouze aktualizační zdroje.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
+"použití: urpmi.update [volby] <jméno> ...\n"
+"kde <jméno> je název zdroje pro aktualizaci.\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "volbu --list-nodes lze použít pouze s volbou --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf verze %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright ©1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: neznámá volba \"%s\", způsob použití vyvoláte s --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"Toto je svobodný software a je volně šiřitelný podle podmínek licence GNU "
-"GPL."
+"  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "použití: urpmf [volby] <soubor>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r              - společně se jménem vypíše verzi a vydání.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet        - nevypíše jméno tagu (výchozí chování, pokud není jméno "
-"tagu"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr ""
-"                      zadáno na příkazové řádce, opak interaktivního režimu)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverzní vyhledávání požadavků balíčku.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - vypíše všechny tagy."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - doplnit výstup balíčkem k odebrání.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr ""
-"  --name          - vypíše tag: jméno rpm souboru (předpokládané, pokud není"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    zadán na příkazové řádce ale bez jména balíčku)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - vypíše tag skupina: group."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - vypíše tag velikost: size."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - vypíše tag sériové číslo: serial."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - vypíše tag souhrn: summary."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - vypíše tag popis: description."
-
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --provides      - vypíše tag poskytuje: all provides (na více řádek)."
-
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - vypíše tag vyžaduje: all requires (na více řádek)."
+"  -u          - odebere balíček pokud je již instalována novější verze.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - vypíše tag soubory: all files (na více řádek)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d               - rozšířený dotaz na závislosti balíčku.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - vypíše tag konflikty: all conflicts (na více řádek)."
+"  --source     - všechny zdrojové balíčky před stažením (pouze uživatel "
+"root).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletes     - vypíše tag nahrazuje: all obsoletes (na více řádek)."
+"  --headers      - extrahuje hlavičky pro balíček z urpmi db na std.\n"
+"                   výstup.\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - seznam dostupných paralelních přezdívek.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --prereqs       - vypíše tag prerekvizity: all prereqs (na více řádek)."
+"  --list-nodes   - vypíše seznam uzlů k dispozici při použití volby --"
+"parallel.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "zadejte urpmf --help pro získání více voleb"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - vypíše seznam dostupných zdrojů.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "nebyl nalezen žádný popis zdroje"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - vypíše balíčky, které jsou k dispozici.\n"
+
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq verze %s\n"
+"Copyright ©2000, 2001, 2002 MandrakeSoft.\n"
+"Toto je svobodný software a je volně šiřitelný podle podmínek licence GNU "
+"GPL.\n"
+"\n"
+"použití:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "příkaz curl selhal: skončil s kódem %d nebo signálem %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalace selhala na uzlu %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "chybí program rsync\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp selhalo, možná není uzel k dispozici"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "příkaz rsync selhal: skončil s kódem %d nebo signálem %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput selhalo, možná není uzel k dispozici"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "chybí program ssh\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "na uzlu %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "syntaktická chyba v souboru s nastavením na řádku %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "selhalo scp na počítači %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "zdroj \"%s\" bude ignorován, pokouší se použít již použitý soubor hdlist"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "počítač %s nemá správnou verzi programu urpmi"
 
 #~ msgid "Remove them all?"
 #~ msgstr "Odebrat všechny?"
@@ -1626,11 +1792,5 @@ msgstr "nebyl nalezen žádný popis zdroje"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h           - vypíše tuto nápovědu.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: neznámá volba \"%s\", způsob použití vyvoláte s --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
-
 #~ msgid "Is it ok?"
 #~ msgstr "Je to správně?"
diff --git a/po/cy.po b/po/cy.po
index e2639b2c..c7029f5e 100644
--- a/po/cy.po
+++ b/po/cy.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-03-02 17:16-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -13,689 +13,820 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "gosod %s\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 "Yy"
 
-#: ../_irpm_.c:33
-#, c-format
+#. 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 "NnIiTt"
+
+#: placeholder.h:18
+#, fuzzy, c-format
+msgid "urpmf version %s"
+msgstr "Fersiwn y Cnewyllyn:"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Hawlfraint (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 ""
-"Gosodiad pecynnau awtomatig...\n"
-"Roeddech wedi gofyn i gael gosod pecyn %s\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Mae'r model yn gywir"
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "defnydd: urpmf [dewisiadau] <ffeil>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Iawn"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
+"yn cael ei roi ar "
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Dileu"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
+"                    linell orchymyn , imae'n anghytûn a'r modd "
+"rhyngweithiol)."
 
-#: ../_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 "NnIiTt"
+#: placeholder.h:24
+#, fuzzy
+msgid "  --all           - print all tags."
+msgstr "Argraffu tudalennau prawf"
 
-#: ../_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 "Yy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad oed "
+"tag yn cael ei gynnig"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (Y/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+
+#: placeholder.h:27
+#, fuzzy
+msgid "  --group         - print tag group: group."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:28
+#, fuzzy
+msgid "  --size          - print tag size: size."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:29
+#, fuzzy
+msgid "  --serial        - print tag serial: serial."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:30
+#, fuzzy
+msgid "  --summary       - print tag summary: summary."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:31
+#, fuzzy
+msgid "  --description   - print tag description: description."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
+"lluosog)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - print tag files: all files (multiple lines)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "try urpmf --help for more options"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "ni chanfyddwyd restr cyfrwng llawn"
+
+#: ../_irpm:1
 #, fuzzy, c-format
 msgid "%s: command not found\n"
 msgstr "Heb ganfod ffeil  RPM"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch `%s' anhysbys!!!\n"
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocol anhysbys ar gyfer %s"
+msgid "Cancel"
+msgstr "Dileu"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "heb ganfod webfetch (curl na wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Iawn"
 
-#: ../urpm.pm_.c:226
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "Methu rhedeg porwr"
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Mae'r model yn gywir"
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "methodd y gosodiad"
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Gosodiad pecynnau awtomatig...\n"
+"Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: ../urpm.pm_.c:251
-#, fuzzy
-msgid "wget is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "gosod %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "methodd wget: gadael gyda%d neu signal %d\n"
+msgid "unable to open rpmdb"
+msgstr ""
 
-#: ../urpm.pm_.c:291
-#, fuzzy
-msgid "curl is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "Methu rhedeg porwr"
 
-#: ../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 "Mae %s yn gwrthdaro gyda %s"
 
-#: ../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 "Mae angen %s ar %s"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "Rhaid eich bod yn wraidd i osod pecyn."
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "Ail-lwytho %s"
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:598
-#, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "Methu rhedeg porwr"
+#: ../urpm.pm:1
+#, c-format
+msgid "malformed input: [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "Methu rhedeg porwr"
+msgid "unable to access medium \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm_.c:651
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%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:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../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 "Methu creu cyfrwng."
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Mae angen un o'r pecynnau canlynol:"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "pecyn anhysbys"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
 msgstr "Methu rhedeg porwr"
 
-#: ../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 "Methu rhedeg porwr"
 
-#: ../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 "Methu creu cyfrwng."
-
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "Argraffu tudalennau prawf"
+msgid "mounting %s"
+msgstr "gosod %s\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\""
-msgstr ""
-
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../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 "Methu rhedeg porwr"
-
-#: ../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 "methodd y gosodiad"
-
-#: ../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 "Ail-lwytho %s"
+msgid "unable to write list file of \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../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\""
+msgid "unable to parse hdlist file of \"%s\""
 msgstr "Methu creu cyfrwng."
 
-#: ../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 "Methu creu cyfrwng."
+#: ../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 "methodd y gosodiad"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "Methu rhedeg porwr"
 
-#: ../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 "Methu rhedeg porwr"
+msgid "...copying failed"
+msgstr "methodd y gosodiad"
 
-#: ../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 "methodd y gosodiad"
+
+#: ../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
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Methu creu cyfrwng."
-
-#: ../urpm.pm_.c:1519
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr "Methu creu cyfrwng."
 
-#: ../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 "Methu rhedeg porwr"
+
+#: ../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 "gosod %s\n"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../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 "Methu rhedeg porwr"
 
-#: ../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
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to write config file [%s]"
 msgstr "Methu rhedeg porwr"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "Methu rhedeg porwr"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../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 "pecyn anhysbys"
-
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+#: ../urpm.pm:1
+#, c-format
+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 "Methu creu cyfrwng."
+#: ../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 "Methu creu cyfrwng."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "Methu rhedeg porwr"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "Methu rhedeg porwr"
+
+#: ../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
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "Methu estyn pecynnau ffynhonnell."
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Rhaid eich bod yn wraidd i osod pecyn."
+msgid "syntax error in config file at line %s"
+msgstr "Methu rhedeg porwr"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "Mae angen %s ar %s"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% wedi cwblhau, cyflymder = %s"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "Mae %s yn gwrthdaro gyda %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %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 "methodd mput, efallai bod nod yn anghyraeddadwy"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "methodd rsync:gadael gyda %d neu signal %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 "methodd rshp, efallai bod nod yn anghyraeddadwy"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "ssh is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "rsync is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "ar nod %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "methodd curl: gadael gyda %d neu signal %d\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Methodd y gosodiad"
+msgid "curl is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "Methodd y gosodiad"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "methodd wget: gadael gyda%d neu signal %d\n"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "methodd y gosodiad"
+msgid "wget is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "nid oes gan y gwesteiwr fersiwn dda o urpmi"
+msgid "copy failed: %s"
+msgstr "methodd y gosodiad"
 
-#: ../urpme_.c:39
+#: ../urpm.pm:1
 #, fuzzy, 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 ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
+msgid "unable to handle protocol: %s"
+msgstr "Methu rhedeg porwr"
 
-#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
-#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:62 ../urpmi_.c:72
-#: ../urpmq_.c:40
-#, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "heb ganfod webfetch (curl na wget)\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-#, fuzzy
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Webfetch `%s' anhysbys!!!\n"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "Ail-lwytho %s"
+
+#: ../urpme:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
+msgstr "bydd tynnu pecynnau %s yn torri'r system"
+
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "pecyn anhysbys"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "bydd tynnu pecynnau %s yn torri'r system"
-
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
+"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
+
+#: ../urpme:1 ../urpmi:1
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
-"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "Ail-lwytho %s"
+#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
+#: ../urpmi.update:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, fuzzy, 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"
@@ -703,865 +834,844 @@ msgid ""
 msgstr ""
 "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"galw nôl yw: \n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
+"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
-"yn cael ei roi ar "
-
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "Argraffu tudalennau prawf"
+"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad oed "
-"tag yn cael ei gynnig"
-
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "Argraffu tudalennau prawf"
-
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "Argraffu tudalennau prawf"
+"  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "enw"
 
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmf:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "enw"
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "chwilio"
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
-"lluosog)."
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
-#: ../urpmf_.c:47
-#, fuzzy
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: ../urpmf_.c:48
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr "  --files         - print tag files: all files (multiple lines)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
+"lluosog)."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "chwilio"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-#, fuzzy
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "enw"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "enw"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+"  --name          - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad oed "
+"tag yn cael ei gynnig"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
+"yn cael ei roi ar "
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"galw nôl yw: \n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: ../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         - defnyddio wget i estyn ffeiliau pell.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Everything already installed"
+msgstr "Pecynnau wedi eu gosod eisoes"
 
-#: ../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         - defnyddio curl i estyn ffeiliau pell.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Methodd y gosodiad"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "methodd y gosodiad"
 
-#: ../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        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
-"                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "grym "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi.addmedia_.c:61
-#, fuzzy
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "gosod %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../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 ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (Y/n) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../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"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
 msgstr ""
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"\n"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
-
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "unable to get source packages, aborting"
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
+"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpmi.addmedia_.c:185
-#, c-format
+#: ../urpmi:1
+#, fuzzy, 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 ""
+msgstr "Rhaid eich bod yn wraidd i osod pecyn."
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "Methu creu cyfrwng."
-
-#: ../urpmi.addmedia_.c:203
-#, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"\n"
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "Methu creu cyfrwng."
+msgid "due to conflicts with %s"
+msgstr "Mae %s yn gwrthdaro gyda %s"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "Mae pecyn gorfodol %s ar goll"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:37
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr " dim gyrrwr wedi ei osod."
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
-#, c-format
+#: ../urpmi:1
+#, fuzzy, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
+msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpmi.update_.c:71
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr ""
 
-#: ../urpmi.update_.c:73
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi_.c:67
-#, fuzzy, 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"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
-
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-#, fuzzy
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "enw"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "enw"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "enw"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "chwilio"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "chwilio"
 
-#: ../urpmi_.c:86
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "enw"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-#, fuzzy
+#: ../urpmi:1
+#, fuzzy, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:103
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-#, fuzzy
-msgid "  -a             - select all matches on command line.\n"
-msgstr "enw"
-
-#: ../urpmi_.c:108
-#, fuzzy
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "chwilio"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-#, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "chwilio"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-#, fuzzy
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "enw"
+#: ../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 ""
+"  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
+"                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-#, fuzzy
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
 
-#: ../urpmi_.c:112
-#, fuzzy
-msgid "  -q             - quiet mode.\n"
-msgstr "enw"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-#, fuzzy
-msgid "  -v             - verbose mode.\n"
-msgstr "enw"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "ddefnyddio amgylchedd penodol ar %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:349
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
-msgstr "Nid oes modd gosod rhai pecynnau"
-
-#: ../urpmi_.c:402
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr " dim gyrrwr wedi ei osod."
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "Mae pecyn gorfodol %s ar goll"
+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 ""
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "Mae %s yn gwrthdaro gyda %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "Methu creu cyfrwng."
 
-#: ../urpmi_.c:421
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "Methu creu cyfrwng."
+
+#: ../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 ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"\n"
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpmi_.c:463
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
 "%s\n"
-msgstr "Rhaid eich bod yn wraidd i osod pecyn."
-
-#: ../urpmi_.c:483 ../urpmq_.c:297
-#, fuzzy
-msgid "unable to get source packages, aborting"
-msgstr "Methu estyn pecynnau ffynhonnell."
+"no need to give <relative path of hdlist> with --distrib"
+msgstr ""
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
+msgid "retrieving mirrors at %s ..."
+msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% wedi cwblhau, cyflymder = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr ""
 
-#: ../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 "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr ""
-"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
-"\n"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (Y/n) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
-#: ../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 ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-#, fuzzy
-msgid "Installation failed"
-msgstr "methodd y gosodiad"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "gosod %s\n"
+#: ../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 ""
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:614
-#, fuzzy
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "grym "
+#: ../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 ""
 
-#: ../urpmi_.c:631
-#, fuzzy
-msgid "Everything already installed"
-msgstr "Pecynnau wedi eu gosod eisoes"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
 
-#: ../urpmq_.c:35
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+
+#: ../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 ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: ../urpmq_.c:46
-#, fuzzy
-msgid "  --list         - list available packages.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:48
-#, fuzzy
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, fuzzy, c-format
+msgid "  -a             - select all media.\n"
 msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr ""
-
-#: ../urpmq_.c:51
+#: ../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 ""
 
-#: ../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      - give all source packages before downloading (root only).\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, fuzzy, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "chwilio"
-
-#: ../urpmq_.c:70
-#, fuzzy
-msgid "  -g             - print groups with name also.\n"
-msgstr "enw"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmq_.c:71
-#, fuzzy
-msgid "  -r             - print version and release with name also.\n"
-msgstr "enw"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmq_.c:174
-#, fuzzy
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "Argraffu tudalennau prawf"
 
-#: placeholder.h:18
-#, fuzzy, c-format
-msgid "urpmf version %s"
-msgstr "Fersiwn y Cnewyllyn:"
-
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
-
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "defnydd: urpmf [dewisiadau] <ffeil>"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
-"yn cael ei roi ar "
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"                    linell orchymyn , imae'n anghytûn a'r modd "
-"rhyngweithiol)."
-
-#: placeholder.h:24
-#, fuzzy
-msgid "  --all           - print all tags."
-msgstr "Argraffu tudalennau prawf"
 
-#: placeholder.h:25
-msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr ""
-"  --name          - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad oed "
-"tag yn cael ei gynnig"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "enw"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "enw"
 
-#: placeholder.h:27
-#, fuzzy
-msgid "  --group         - print tag group: group."
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "chwilio"
 
-#: placeholder.h:28
-#, fuzzy
-msgid "  --size          - print tag size: size."
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
-#: placeholder.h:29
-#, fuzzy
-msgid "  --serial        - print tag serial: serial."
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
 
-#: placeholder.h:30
-#, fuzzy
-msgid "  --summary       - print tag summary: summary."
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
 
-#: placeholder.h:31
-#, fuzzy
-msgid "  --description   - print tag description: description."
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - give all source packages before downloading (root only).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
-"lluosog)."
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
-"  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (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 ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "try urpmf --help for more options"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Methodd y gosodiad"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "ni chanfyddwyd restr cyfrwng llawn"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "methodd rshp, efallai bod nod yn anghyraeddadwy"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "methodd curl: gadael gyda %d neu signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "methodd mput, efallai bod nod yn anghyraeddadwy"
 
-#, fuzzy
-#~ msgid "rsync is missing\n"
-#~ msgstr "Mae pecyn gorfodol %s ar goll"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "ar nod %s"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "methodd rsync:gadael gyda %d neu signal %d\n"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "methodd y gosodiad"
 
-#, fuzzy
-#~ msgid "ssh is missing\n"
-#~ msgstr "Mae pecyn gorfodol %s ar goll"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "nid oes gan y gwesteiwr fersiwn dda o urpmi"
diff --git a/po/da.po b/po/da.po
index b9eedc88..1ae4520f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,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-02-25 00:45+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@klid.dk>\n"
@@ -17,1122 +17,1262 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "installerer %s\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 "YyJj"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf version %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Automatisk installation af pakker...\n"
-"Du bestilte installation af pakke %s\n"
+"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Er det o.k.?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "brug: urpmf [flag] [<fil>]"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "O.k."
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - skriv ikke m�rkenavn (standard hvis intet m�rke angivet "
+"p� kommando"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Annull�r"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    linje, ikke kompatibel med interaktivt modus)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - skriv alle m�rker."
 
-#: ../_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 "YyJj"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - skriv m�rkenavn: rpm filnavn (antaget hvis intet m�rke "
+"givet p�"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    kommandolinje, men uden pakkenavn)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - skriv m�rkegruppe: gruppe."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - skriv m�rke-st�rrelse: st�rrelse."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - skriv m�rke-serienummer: serienummer."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - skriv m�rke-resum�: resum�."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - skriv m�rke-beskrivelse: beskrivelse."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - skriv m�rke-tilbud: alle tilbud (flere linjer)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - skriv m�rke-krav: alle krav (flere linjer)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - skriv m�rke-filer: alle filer (flere linjer)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - skriv m�rke-konflikter: alle konflikter (flere linjer)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - skriv m�rke-for�ldede: alle for�ldede (flere linjer)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - skriv m�rke-foruds�tninger: alle foruds�tninger (flere "
+"linjer)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "pr�v urpmf --help for flere valgmuligheder"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "ingen fuld media-liste blev fundet"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: kommando ikke fundet\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Ukendt webfetch `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "ukendt protokol defineret for %s"
+msgid "Cancel"
+msgstr "Annull�r"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "intet webhentningprogram (for �jeblikket 'curl' eller 'wget') fundet\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "O.k."
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "kunne ikke behandle protokol: %s"
+msgid "Is this OK?"
+msgstr "Er det o.k.?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kopiering mislykkedes: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automatisk installation af pakker...\n"
+"Du bestilte installation af pakke %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "'wget' mangler\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "installerer %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget mislykkedes: afsluttede med %d eller signal %d\n"
+msgid "unable to open rpmdb"
+msgstr "kunne ikke �bne rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "'curl' mangler\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "kunne ikke n� rpm fil [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "media \"%s\" pr�ver at bruge en allerede brugt liste, media ignoreret"
+msgid "%s conflicts with %s"
+msgstr "%s er i modstrid med %s"
 
-#: ../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 ""
-"kan ikke behandle media \"%s\" da listefil allerede bliver brugt af et andet "
-"media"
+msgid "%s is needed by %s"
+msgstr "%s beh�ves af %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"Kunne ikke bruge navnet '%s' for navnl�st medium fordi det allerede er brugt"
+msgid "unable to install package %s"
+msgstr "kunne ikke installere pakke %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"kunne ikke tage media \"%s\" i beregning da ingen listefil [%s] eksisterer"
+msgid "unable to remove package %s"
+msgstr "kan ikke fjerne pakke %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kunne ikke bestemme media for denne hdlist-fil [%s]"
+msgid "Preparing..."
+msgstr "Forbereder..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kunne ikke n� hdlist-fil af \"%s\", media ignoreret"
+msgid "...retrieving failed: %s"
+msgstr "...hentning mislykkedes: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "kan ikke f� adgang til filen \"%s\", media ignoreret"
+msgid "...retrieving done"
+msgstr "...hentning f�rdig"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "henter rpm-filer..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pr�ver at forbig� eksisterende media \"%s\", undg�r"
+msgid "malformed input: [%s]"
+msgstr "misdannet inddata: [%s]"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kunne ikke finde hdlist-fil for \"%s\", media ignoreret"
+msgid "unable to access medium \"%s\""
+msgstr "kunne ikke n� media \"%s\""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kunne ikke finde listefil for \"%s\", media ignoreret"
+msgid "urpmi database locked"
+msgstr "urpmi-database l�st"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "inkonsistent listefil for \"%s\", media ignoreret"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "inkonsistent media \"%s\" m�rket fjernbart, men er det ikke"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kunne ikke inspicere listefil for \"%s\", media ignoreret"
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" er ikke valgt"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunne ikke l�se rpm-fil [%s] fra media \"%s\""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tager udskifteligt medium som \"%s\""
+msgid "package %s is not found."
+msgstr "pakke %s er ikke fundet."
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kan ikke finde stinavn for udskifteligt medie \"%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:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "kunne ikke skrive config-fil [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "der er flere pakker med samme rpm-filnavn \"%s\""
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "skriv config fil [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "kunne ikke fortolke [%s] korrekt ved v�rdi \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "kunne ikke tolke '%s' i fil [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "F�lgende pakker indeholder %s: %s"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "unders�ger parallelbehandling i fil [%s]"
+msgid "no package named %s"
+msgstr "ingen pakke kaldet %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "fandt parallelbehandling for knuder: %s"
+msgid "error registering local packages"
+msgstr "fejl ved registrering af lokale pakker"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "bruger tilknyttet medium for parallel tilstand: %s"
+msgid "unable to register rpm file"
+msgstr "kunne ikke n� rpm fil [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "henter rpm-filer..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "kan ikke bruge parallel mulighed \"%s\""
+msgid "invalid rpm file name [%s]"
+msgstr "ugyldigt rpm-filnavn [%s]"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis kan ikke bruges med --media, --update eller --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr "ingen indgange omflyttede i depsliste"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "omflyttede %s indgange i depsliste"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "afmonterer %s"
 
-#: ../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 "mounting %s"
+msgstr "monterer %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "fjerner %d for�ldede hoveder i hurtiglager"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "fandt %d hoveder i hurtiglager"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "byggede hdlist syntese fil for media \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "unders�ger hdlist-fil [%s]"
 
-#: ../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]"
 msgstr "unders�ger syntese-fil [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problem ved l�sning af hdlist-fil for media \"%s\""
+msgid "building hdlist [%s]"
+msgstr "bygger hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "l�ser hoveder fra medium \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "udf�rer andet genneml�b for at beregne afh�ngigheder\n"
 
-#: ../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\""
 msgstr "problem ved l�sning af syntese-fil for media \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "kunne ikke �bne rpmdb"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "media \"%s\" eksisterer allerede"
+msgid "nothing written in list file for \"%s\""
+msgstr "ingenting skrevet i listefil for \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "tilf�jede media %s"
+msgid "writing list file for medium \"%s\""
+msgstr "skriver liste-fil for medie \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "kan ikke f� adgang til f�rste installationsmedium"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "kunne ikke skrive listefil for \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "kopierer hdlists-fil..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fil [%s] er allerede brugt p� det samme media \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kopiering f�rdig"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "kunne ikke fortolke hdlist-filen \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kopiering f�rdig"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ingen hdlist-fil fundet for media \"%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)"
-msgstr ""
-"kunne ikke f� fat p� det f�rste installationsmedium (ingen Mandrake/base/"
-"hdlists fil fundet)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "hentning af kilde-hdlist (eller -syntese) mislykkedes"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "henter hdlists-fil..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "unders�ger MD5SUM-fil"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...hentning f�rdig"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "kopierer kilde-hdlist (eller -syntese) for \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...hentning mislykkedes: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "henter kilde-hdlist (eller -syntese) for \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "ugyldig hdlist beskrivelse '%s' i hdlists-fil"
+msgid "retrieving description file of \"%s\"..."
+msgstr "henter beskrivelsesfil for '%s'"
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "pr�ver at v�lge ikke-eksisterende media \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "ingen rpm filer fundet fra [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "kunne ikke l�se rpm-filer fra  [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "v�lger flere medier: %s"
+msgid "reading rpm files from [%s]"
+msgstr "l�ser rpm-filer fra [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "fjerner medium \"%s\""
+msgid "...copying done"
+msgstr "...kopiering f�rdig"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi-database l�st"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...kopiering f�rdig"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kunne ikke n� media \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "kopierer kildeliste for \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopierer beskrivelsesfil for \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "kopi af [%s] mislykkedes"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopierer kilde-hdlist (eller -syntese) for \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "kopi af [%s] mislykkedes"
+msgid "copying description file of \"%s\"..."
+msgstr "kopierer beskrivelsesfil for \"%s\"..."
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "unders�ger MD5SUM-fil"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "fjerner medium \"%s\""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopierer kildeliste for \"%s\"..."
+msgid "selecting multiple media: %s"
+msgstr "v�lger flere medier: %s"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "l�ser rpm-filer fra [%s]"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "kunne ikke l�se rpm-filer fra  [%s]: %s"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "pr�ver at v�lge ikke-eksisterende media \"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ingen rpm filer fundet fra [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"kunne ikke f� fat p� det f�rste installationsmedium (ingen Mandrake/base/"
+"hdlists fil fundet)"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "henter beskrivelsesfil for '%s'"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "ugyldig hdlist beskrivelse '%s' i hdlists-fil"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "henter kilde-hdlist (eller -syntese) for \"%s\"..."
+msgid "retrieving hdlists file..."
+msgstr "henter hdlists-fil..."
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "hentning af kilde-hdlist (eller -syntese) mislykkedes"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying hdlists file..."
+msgstr "kopierer hdlists-fil..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ingen hdlist-fil fundet for media \"%s\""
+msgid "unable to access first installation medium"
+msgstr "kan ikke f� adgang til f�rste installationsmedium"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fil [%s] er allerede brugt p� det samme media \"%s\""
+msgid "added medium %s"
+msgstr "tilf�jede media %s"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "kunne ikke fortolke hdlist-filen \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" eksisterer allerede"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "kunne ikke skrive listefil for \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problem ved l�sning af hdlist-fil for media \"%s\""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "skriver liste-fil for medie \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis kan ikke bruges med --media, --update eller --parallel"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ingenting skrevet i listefil for \"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "kan ikke bruge parallel mulighed \"%s\""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "udf�rer andet genneml�b for at beregne afh�ngigheder\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "bruger tilknyttet medium for parallel tilstand: %s"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "l�ser hoveder fra medium \"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr "fandt parallelbehandling for knuder: %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "bygger hdlist [%s]"
+msgid "examining parallel handler in file [%s]"
+msgstr "unders�ger parallelbehandling i fil [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "byggede hdlist syntese fil for media \"%s\""
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "kunne ikke tolke '%s' i fil [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "fandt %d hoveder i hurtiglager"
+msgid "write config file [%s]"
+msgstr "skriv config fil [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "fjerner %d for�ldede hoveder i hurtiglager"
+msgid "unable to write config file [%s]"
+msgstr "kunne ikke skrive config-fil [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "monterer %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "afmonterer %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "omflyttede %s indgange i depsliste"
+msgid "taking removable device as \"%s\""
+msgstr "tager udskifteligt medium som \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "ingen indgange omflyttede i depsliste"
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "ugyldigt rpm-filnavn [%s]"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kunne ikke inspicere listefil for \"%s\", media ignoreret"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "henter rpm-filer..."
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "inkonsistent listefil for \"%s\", media ignoreret"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "kunne ikke n� rpm fil [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kunne ikke finde listefil for \"%s\", media ignoreret"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "kunne ikke n� rpm fil [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kunne ikke finde hdlist-fil for \"%s\", media ignoreret"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "fejl ved registrering af lokale pakker"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pr�ver at forbig� eksisterende media \"%s\", undg�r"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "ingen pakke kaldet %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "kan ikke f� adgang til filen \"%s\", media ignoreret"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "F�lgende pakker indeholder %s: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kunne ikke n� hdlist-fil af \"%s\", media ignoreret"
 
-#: ../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\""
-msgstr "der er flere pakker med samme rpm-filnavn \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kunne ikke bestemme media for denne hdlist-fil [%s]"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "kunne ikke fortolke [%s] korrekt ved v�rdi \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"kunne ikke tage media \"%s\" i beregning da ingen listefil [%s] eksisterer"
 
-#: ../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 "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
+"Kunne ikke bruge navnet '%s' for navnl�st medium fordi det allerede er brugt"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"kan ikke behandle media \"%s\" da listefil allerede bliver brugt af et andet "
+"media"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "pakke %s er ikke fundet."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "media \"%s\" pr�ver at bruge en allerede brugt liste, media ignoreret"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" er ikke valgt"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "media \"%s\" pr�ver at bruge en allerede brugt hdlist, media ignoreret"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunne ikke l�se rpm-fil [%s] fra media \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "syntaksfejl i config fil ved linje %s"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "inkonsistent media \"%s\" m�rket fjernbart, men er det ikke"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% f�rdig, hastighed = %s"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "misdannet inddata: [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% af %s f�rdige, resterer = %s, hastighed = %s"
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "henter rpm-filer..."
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "'rsync' mislykkedes: afsluttede med %d eller signal %d\n"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Forbereder..."
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "'ssh' mangler\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "kan ikke fjerne pakke %s"
+msgid "rsync is missing\n"
+msgstr "'rsync' mangler\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "kunne ikke installere pakke %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "'curl' mislykkedes: afsluttede med %d eller signal %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s beh�ves af %s"
+msgid "curl is missing\n"
+msgstr "'curl' mangler\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s er i modstrid med %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget mislykkedes: afsluttede med %d eller signal %d\n"
 
-#: ../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 mislykkedes, m�ske er en knude utilg�ngelig"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr "'wget' mangler\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 "rsch mislykkedes, m�ske er en knude utilg�ngelig"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "kopiering mislykkedes: %s"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "p� knude %s"
+msgid "unable to handle protocol: %s"
+msgstr "kunne ikke behandle protokol: %s"
 
-#: ../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 "Installationen fejlede p� knude %s"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "intet webhentningprogram (for �jeblikket 'curl' eller 'wget') fundet\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 "Installation er mulig"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "ukendt protokol defineret for %s"
 
-#: ../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 mislykkedes p� v�rt %s"
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Ukendt webfetch `%s' !!!\n"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpme:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "v�rt %s har ikke en god version af urpmi"
+msgid "Removing failed"
+msgstr "Fjernelse mislykkedes"
 
-#: ../urpme_.c:39
+#: ../urpme: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"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"urpmi version %s\n"
-"Ophavsret (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er frit programmel og kan redistribueres under vilk�rene for GNU GPL.\n"
-"\n"
-"brug:\n"
-
-#: ../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         - udskriv denne hj�lpebesked.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - v�lg automatisk en pakke ved valg.\n"
-
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - afpr�v om installationen kan udf�res korrekt.\n"
+"For at tilfredsstille afh�ngigheder vil de f�lgende pakker blive fjernet (%d "
+"Mb)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - distribueret urpmi over maskiner med alias.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Tjekker for at fjerne de f�lgende pakker"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - v�lg alle pakker matchende udtryk.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ingenting at fjerne"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: ukendt parameter \"-%s\", tjek brug med --help\n"
+msgid "removing package %s will break your system"
+msgstr "fjernelse af pakke %s vil skade dit system"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "ukendt pakke"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "ukendte pakker"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "fjernelse af pakke %s vil skade dit system"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: ukendt parameter \"-%s\", tjek brug med --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Ingenting at fjerne"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - v�lg alle pakker matchende udtryk.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Tjekker for at fjerne de f�lgende pakker"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - distribueret urpmi over maskiner med alias.\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 ""
-"For at tilfredsstille afh�ngigheder vil de f�lgende pakker blive fjernet (%d "
-"Mb)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - afpr�v om installationen kan udf�res korrekt.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Fjernelse mislykkedes"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - v�lg automatisk en pakke ved valg.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - udskriv denne hj�lpebesked.\n"
+
+#: ../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 version %s\n"
-"Ophavsret (C) 2002 MandrakeSoft.\n"
-"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL.\n"
+"urpmi version %s\n"
+"Ophavsret (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er frit programmel og kan redistribueres under vilk�rene for GNU GPL.\n"
 "\n"
 "brug:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - brug kun opdateringsmedia.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"tilbagekald er :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - brug kun de opgvne media, adskilt med komma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  (              - h�jreparantes for at lukke gruppeudtryk.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - venstreparantes for at �bne gruppeudtryk.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - udf�rlig tilstand.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - negation, sand hvis udtryk er falsk.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - skriv ikke m�rkenavn (standard hvis intet m�rke angivet "
-"p�\n"
-"                    kommandolinjen, inkompatibel med interaktiv tilstand).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - skriv alle m�rker.\n"
+"  -o             - bin�r ELLER-operator, sand hvis et udtryk er sandt.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - skriv m�rkenavn: rpm filnavn (antaget hvis intet m�rke "
-"givet p�\n"
-"                    kommandolinjen, inkompatibel med interaktiv tilstand).\n"
+"  -a             - bin�r OG-operator, sand hvis begge udtryk er sande.\n"
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - skriv m�rkegruppe: gruppe.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inklud�r perl-kode direkte som perl -e.\n"
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - skriv m�rke-st�rrelse: st�rrelse.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - udskriv version, udgave og arkitektur med navn.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - skriv m�rke-st�rrelse: st�rrelse.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - ignor�r forskel p� store og sm� bogstaver i alle "
+"m�nstre.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - skriv m�rke-resum�: resum�.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+"  --obsoletes     - skriv m�rke-for�ldede: alle for�ldede (flere linjer).\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - skriv m�rke-beskrivelse: beskrivelse.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+"  --conflicts     - skriv m�rke-konflikter: alle konflikter (flere linjer).\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr "  --provides      - skriv m�rke-tilbud: alle tilbud (flere linjer).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - skriv m�rke-filer: alle filer (flere linjer).\n"
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr "  --requires      - skriv m�rke-krav: alle krav (flere linjer).\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - skriv m�rke-filer: alle filer (flere linjer).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+msgstr "  --provides      - skriv m�rke-tilbud: alle tilbud (flere linjer).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr ""
-"  --conflicts     - skriv m�rke-konflikter: alle konflikter (flere linjer).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - skriv m�rke-beskrivelse: beskrivelse.\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - skriv m�rke-for�ldede: alle for�ldede (flere linjer).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - skriv m�rke-resum�: resum�.\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignor�r forskel p� store og sm� bogstaver i alle "
-"m�nstre.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - skriv m�rke-st�rrelse: st�rrelse.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - udskriv version, udgave og arkitektur med navn.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - skriv m�rke-st�rrelse: st�rrelse.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inklud�r perl-kode direkte som perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - skriv m�rkegruppe: gruppe.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - bin�r OG-operator, sand hvis begge udtryk er sande.\n"
+"  --name          - skriv m�rkenavn: rpm filnavn (antaget hvis intet m�rke "
+"givet p�\n"
+"                    kommandolinjen, inkompatibel med interaktiv tilstand).\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - skriv alle m�rker.\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - bin�r ELLER-operator, sand hvis et udtryk er sandt.\n"
+"  --quiet         - skriv ikke m�rkenavn (standard hvis intet m�rke angivet "
+"p�\n"
+"                    kommandolinjen, inkompatibel med interaktiv tilstand).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - negation, sand hvis udtryk er falsk.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - udf�rlig tilstand.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - venstreparantes for at �bne gruppeudtryk.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  (              - h�jreparantes for at lukke gruppeudtryk.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - brug kun de opgvne media, adskilt med komma.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"tilbagekald er :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - brug kun opdateringsmedia.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"brug: urpmi.addmedia [--update] <navn> <url> [med <relativ sti>]\n"
-"hvor <url> er en af\n"
-"       file://<sti>\n"
-"       ftp://<login>:<adgangskode>@<v�rt>/<sti> with <relativt filnavn for "
-"hdlist>\n"
-"       ftp://<v�rt>/<sti> with <relativt filnavn for hdlist>\n"
-"       http://<v�rt>/<sti> with <relativt filnavn for hdlist>\n"
-"       removable://<sti>\n"
+"urpmf version %s\n"
+"Ophavsret (C) 2002 MandrakeSoft.\n"
+"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL.\n"
 "\n"
-"og [valgmuligheder] er f�lgende\n"
+"brug:\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         - brug wget til at hente eksterne filer.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "alting er allerede installeret"
 
-#: ../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         - brug 'curl' til at hente retrieve eksterne filer.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Installation er mulig"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - begr�ns hastighed p� hentning.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installationen fejlede"
 
-#: ../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        - brug den angivne HTTP proxy, portnummeret antages at\n"
-"                   v�re 1080 som standard (formatet er <proxyv�rt[:port]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pr�v installation med endnu st�rre kraft (--force)? (j/N) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - angiv bruger og adgangskode til brug for kontrol\n"
-"                   af proxy (formatet er <bruger:adgangskode>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�v installation uden at tjekke afh�ngigheder? (j/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - opret et opdateringsmedium.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distribuerer %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --distrib      - opret automatisk alle media fra et installationsmedium.\n"
+"Installationen mislykkedes, nogle filer mangler:\n"
+"%s\n"
+"Du �nsker m�ske at opdatere din urpmi-database"
 
-#: ../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  - opret automatisk et medium for XXX-delen af en\n"
-"                   distribution, XXX kan v�re main, contrib, updates eller\n"
-"                   alt andet der er blevet konfigureret;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - brug angivet adresse for liste over spejl, standard er\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
+msgstr "�nsker du at forts�tte installationen?"
 
-#: ../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"
-msgstr ""
-"  --version      - brug angivet distributionsversion, standard tages fra\n"
-"                   versionen af distributionen indikeret ved den\n"
-"                   installerede mandrake-release pakke.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "De f�lgende pakker har d�rlige signaturer"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - brug angivet arkitektur, standard er arkitekturen af\n"
-"                   mandrake-release pakken installeret.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Tryk p� retur, n�r den er f�rdig..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - rydder katalog med cache for headere.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "V�r venlig at inds�tte mediet med navnet %s i enhed [%s]"
 
-#: ../urpmi.addmedia_.c:75
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"  -h             - fors�g at finde og bruge syntese- eller hdlist-fil.\n"
-
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - gennemf�r generering af hdlist-filer.\n"
-
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "kan ikke tilf�je opdateringer af en cooker-distribution\n"
+"For at tilfredsstille afh�ngigheder vil de f�lgende pakker blive installeret "
+"(%d Mb)"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"Du skal v�re root for at installere de f�lgende afh�ngigheder:\n"
 "%s\n"
-"ingen grund til at angive <relativ sti for hdlist> med --distrib"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kan ikke opdatere medie \"%s\"\n"
-
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"De f�lgende pakker skal fjernes for at andre kan opgraderes:\n"
 "%s\n"
-"<relativ sti for hdlist> mangler\n"
+"er dette i orden?"
+
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr "ikke �nsket"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "grundet modstrid med %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "grundet manglende %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "grundet uopfyldt %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "for at kunne installere %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"Nogen forespurgte pakker kan ikke installeres:\n"
 "%s\n"
-"'with' mangler for ftp-medie\n"
+"er dette i orden?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kan ikke oprette medie \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"brug: urpmi.removemedia [-a] <navn> ...\n"
-"hvor <navn> er et medie-navn der skal fjernes.\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Undskyld, d�rligt valg, pr�v igen\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - v�lg alle medier.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Hvad er dit valg? (1-%d) "
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ukendte valg '%s'\n"
+msgid "One of the following packages is needed:"
+msgstr "Der er brug for en af de f�lgende pakker:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting at fjerne (brug urpmi.addmedia til at tilf�je et medie)\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Der er brug for en af de f�lgende pakker for at installere %s:"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"mangler det element der skal fjernes\n"
-"(�n af %s)\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "Kun superbrugeren har lov til at installere pakker"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"brug: urpmi.update [valgmuligheder] <navn> ...\n"
-"hvor <navn> er et medie-navn der skal opdateres.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "bruger s�rligt milj� p� %s\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - opdat�r kun opdateringsmedia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - v�lg alle ikke-flytbare media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Hvad der kan g�res med bin�re rpm-filer ved brug af --install-src"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - gennemf�r fuldst�ndig beregning af depslist.ordered-fil.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ukendt parameter \"-%s\", tjek brug med --help\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilf�je et medie)\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "Forkert proxy-erkl�ring p� kommandolinje\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"mangler det element der skal opdateres\n"
-"(�n af %s)\n"
+"  navne eller rpm-filer givne p� kommandolinjen vil blive installeret.\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1 ../urpmq: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"
-msgstr ""
-"urpmi version %s\n"
-"Ophavsret (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL.\n"
-"\n"
-"brug:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - udf�rlig tilstand.\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stille udgave.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - v�lg automatisk pakker for opgradering af systemet.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - n�ste pakke er en kildepakke (samme som --src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - gennemf�r s�gning efter fuzzy (samme som -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - gennemf�r upr�cis s�gning (samme som --fuzzy).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - n�ste pakke er en kildepakke (samme som -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - s�g ikke i 'provides' for at finde pakke.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - install�r kun kildepakker (ingen bin�re).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - tillad s�gning i 'provides' for at finde pakke.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - fjern rpm fra cache f�r noget andet.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - v�lg alle tr�ffere p� kommandolinje.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - behold rpm ikke brugt i cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - udelukkelsessti adskilt med komma.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force        - gennemf�r kald selv om nogen pakker ikke eksisterer.\n"
+"  --verify-rpm   - kontroll�r rpm-signatur f�r installation.\n"
+"                   (--no-verify-rpm deaktiverer det, standard er "
+"aktiveret).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - tillad at sp�rge bruger om installering af pakker uden "
-"kontrol af\n"
-"                   afh�ngigheder.\n"
+"  --best-output  - v�lg bedste gr�nsesnit svarende til milj�et:\n"
+"                   X- eller tekst-udgave.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - brug X-gr�nsesnit.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
-"  --allow-force  - tillad at sp�rge bruger om installering af pakker\n"
-"                   uden kontrol af afh�ngigheder og integritet.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr "  --env          - brug specifikt milj� (typisk ved en fejlrapport).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1140,446 +1280,472 @@ msgstr ""
 "  --bug          - udskriv en fejlrapport i et katalog angivet i n�ste\n"
 "                   argument.\n"
 
-#: ../urpmi_.c:98
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr "  --env          - brug specifikt milj� (typisk ved en fejlrapport).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - brug X-gr�nsesnit.\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --best-output  - v�lg bedste gr�nsesnit svarende til milj�et:\n"
-"                   X- eller tekst-udgave.\n"
+"  --proxy-user   - angiv bruger og adgangskode til brug for kontrol\n"
+"                   af proxy (formatet er <bruger:adgangskode>).\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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --verify-rpm   - kontroll�r rpm-signatur f�r installation.\n"
-"                   (--no-verify-rpm deaktiverer det, standard er "
-"aktiveret).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - udelukkelsessti adskilt med komma.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - v�lg alle tr�ffere p� kommandolinje.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - tillad s�gning i 'provides' for at finde pakke.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - s�g ikke i 'provides' for at finde pakke.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - gennemf�r upr�cis s�gning (samme som --fuzzy).\n"
+"  --proxy        - brug den angivne HTTP proxy, portnummeret antages at\n"
+"                   v�re 1080 som standard (formatet er <proxyv�rt[:port]>).\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - n�ste pakke er en kildepakke (samme som --src).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - begr�ns hastighed p� hentning.\n"
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - stille udgave.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - brug 'curl' til at hente retrieve eksterne filer.\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - udf�rlig tilstand.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - brug wget til at hente eksterne filer.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  navne eller rpm-filer givne p� kommandolinjen vil blive installeret.\n"
+"  --allow-force  - tillad at sp�rge bruger om installering af pakker\n"
+"                   uden kontrol af afh�ngigheder og integritet.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ukendt parameter \"-%s\", tjek brug med --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Hvad der kan g�res med bin�re rpm-filer ved brug af --install-src"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - tillad at sp�rge bruger om installering af pakker uden "
+"kontrol af\n"
+"                   afh�ngigheder.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - gennemf�r kald selv om nogen pakker ikke eksisterer.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "bruger s�rligt milj� p� %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Kun superbrugeren har lov til at installere pakker"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - behold rpm ikke brugt i cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Der er brug for en af de f�lgende pakker for at installere %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - fjern rpm fra cache f�r noget andet.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Der er brug for en af de f�lgende pakker:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - install�r kun kildepakker (ingen bin�re).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hvad er dit valg? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - n�ste pakke er en kildepakke (samme som -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Undskyld, d�rligt valg, pr�v igen\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - gennemf�r s�gning efter fuzzy (samme som -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Nogen forespurgte pakker kan ikke installeres:\n"
-"%s\n"
-"er dette i orden?"
+"  --auto-select  - v�lg automatisk pakker for opgradering af systemet.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "for at kunne installere %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "grundet uopfyldt %s"
+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 version %s\n"
+"Ophavsret (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL.\n"
+"\n"
+"brug:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "grundet manglende %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kan ikke opdatere medie \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "grundet modstrid med %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "ikke �nsket"
+msgid "unable to create medium \"%s\"\n"
+msgstr "kan ikke oprette medie \"%s\"\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 ""
-"De f�lgende pakker skal fjernes for at andre kan opgraderes:\n"
 "%s\n"
-"er dette i orden?"
+"'with' mangler for ftp-medie\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"For at tilfredsstille afh�ngigheder vil de f�lgende pakker blive installeret "
-"(%d Mb)"
+"%s\n"
+"<relativ sti for hdlist> mangler\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 ""
-"Du skal v�re root for at installere de f�lgende afh�ngigheder:\n"
 "%s\n"
+"ingen grund til at angive <relativ sti for hdlist> med --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "henter rpm-filer..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% af %s f�rdige, resterer = %s, hastighed = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "kan ikke tilf�je opdateringer af en cooker-distribution\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% f�rdig, hastighed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ukendte valg '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "V�r venlig at inds�tte mediet med navnet %s i enhed [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Tryk p� retur, n�r den er f�rdig..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "De f�lgende pakker har d�rlige signaturer"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - gennemf�r generering af hdlist-filer.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "�nsker du at forts�tte installationen?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - fors�g at finde og bruge syntese- eller hdlist-fil.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (j/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - rydder katalog med cache for headere.\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 ""
-"Installationen mislykkedes, nogle filer mangler:\n"
-"%s\n"
-"Du �nsker m�ske at opdatere din urpmi-database"
+"  --arch         - brug angivet arkitektur, standard er arkitekturen af\n"
+"                   mandrake-release pakken installeret.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Installationen fejlede"
+#: ../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      - brug angivet distributionsversion, standard tages fra\n"
+"                   versionen af distributionen indikeret ved den\n"
+"                   installerede mandrake-release pakke.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distribuerer %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - brug angivet adresse for liste over spejl, standard er\n"
+"                   %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pr�v installation uden at tjekke afh�ngigheder? (j/N) "
+#: ../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  - opret automatisk et medium for XXX-delen af en\n"
+"                   distribution, XXX kan v�re main, contrib, updates eller\n"
+"                   alt andet der er blevet konfigureret;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pr�v installation med endnu st�rre kraft (--force)? (j/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - opret automatisk alle media fra et installationsmedium.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "alting er allerede installeret"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - opret et opdateringsmedium.\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 version %s\n"
-"Ophavsret (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL.\n"
+"brug: urpmi.addmedia [--update] <navn> <url> [med <relativ sti>]\n"
+"hvor <url> er en af\n"
+"       file://<sti>\n"
+"       ftp://<login>:<adgangskode>@<v�rt>/<sti> with <relativt filnavn for "
+"hdlist>\n"
+"       ftp://<v�rt>/<sti> with <relativt filnavn for hdlist>\n"
+"       http://<v�rt>/<sti> with <relativt filnavn for hdlist>\n"
+"       removable://<sti>\n"
 "\n"
-"brug:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list          - skriv tilg�ngelige pakker.\n"
+"og [valgmuligheder] er f�lgende\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - list tilg�ngelige medier.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"mangler det element der skal fjernes\n"
+"(�n af %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - list tilg�ngelige knuder ved brug af --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting at fjerne (brug urpmi.addmedia til at tilf�je et medie)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - list tilg�ngelige parallelle aliaser.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - v�lg alle medier.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - udtr�k headere for pakke listet fra urpmi-db til\n"
-"                   stdud (kun root).\n"
+"brug: urpmi.removemedia [-a] <navn> ...\n"
+"hvor <navn> er et medie-navn der skal fjernes.\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - giv alle kildepakker f�r hentning (kun root).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"mangler det element der skal opdateres\n"
+"(�n af %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - udvid foresp�rgsel til pakkeafh�ngigheder.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilf�je et medie)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - fjern pakke hvis en nyere version allerede er "
-"installeret.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - f�rdigg�r uddata med pakke der skal fjernes.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - omvendt s�gning til hvad der kr�ver pakke.\n"
+"  -d             - gennemf�r fuldst�ndig beregning af depslist.ordered-fil.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - udskriv ogs� grupper med navn.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - v�lg alle ikke-flytbare media.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - udskriv ogs� version og udgave med navn.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - opdat�r kun opdateringsmedia.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  navne eller rpm-filer givne p� kommandolinjen bliver forespurgt.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"brug: urpmi.update [valgmuligheder] <navn> ...\n"
+"hvor <navn> er et medie-navn der skal opdateres.\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes kan kun bruges med --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf version %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke l�se rpm-fil \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ukendt parameter \"-%s\", tjek brug med --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr ""
-"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  navne eller rpm-filer givne p� kommandolinjen bliver forespurgt.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "brug: urpmf [flag] [<fil>]"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - udskriv ogs� version og udgave med navn.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - skriv ikke m�rkenavn (standard hvis intet m�rke angivet "
-"p� kommando"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - udskriv ogs� grupper med navn.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    linje, ikke kompatibel med interaktivt modus)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - omvendt s�gning til hvad der kr�ver pakke.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - skriv alle m�rker."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - f�rdigg�r uddata med pakke der skal fjernes.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - skriv m�rkenavn: rpm filnavn (antaget hvis intet m�rke "
-"givet p�"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    kommandolinje, men uden pakkenavn)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - skriv m�rkegruppe: gruppe."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - skriv m�rke-st�rrelse: st�rrelse."
+"  -u             - fjern pakke hvis en nyere version allerede er "
+"installeret.\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - skriv m�rke-serienummer: serienummer."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - udvid foresp�rgsel til pakkeafh�ngigheder.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - skriv m�rke-resum�: resum�."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - giv alle kildepakker f�r hentning (kun root).\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - skriv m�rke-beskrivelse: beskrivelse."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - udtr�k headere for pakke listet fra urpmi-db til\n"
+"                   stdud (kun root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - skriv m�rke-tilbud: alle tilbud (flere linjer)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - list tilg�ngelige parallelle aliaser.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - skriv m�rke-krav: alle krav (flere linjer)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - list tilg�ngelige knuder ved brug af --parallel.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - skriv m�rke-filer: alle filer (flere linjer)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - list tilg�ngelige medier.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr ""
-"  --conflicts     - skriv m�rke-konflikter: alle konflikter (flere linjer)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list          - skriv tilg�ngelige pakker.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr ""
-"  --obsoletes     - skriv m�rke-for�ldede: alle for�ldede (flere linjer)."
-
-#: 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       - skriv m�rke-foruds�tninger: alle foruds�tninger (flere "
-"linjer)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "pr�v urpmf --help for flere valgmuligheder"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "ingen fuld media-liste blev fundet"
+"urpmq version %s\n"
+"Ophavsret (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL.\n"
+"\n"
+"brug:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "'curl' mislykkedes: afsluttede med %d eller signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Installationen fejlede p� knude %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "'rsync' mangler\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rsch mislykkedes, m�ske er en knude utilg�ngelig"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "'rsync' mislykkedes: afsluttede med %d eller signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput mislykkedes, m�ske er en knude utilg�ngelig"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "'ssh' mangler\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "p� knude %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "syntaksfejl i config fil ved linje %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp mislykkedes p� v�rt %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "media \"%s\" pr�ver at bruge en allerede brugt hdlist, media ignoreret"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "v�rt %s har ikke en god version af urpmi"
 
 #~ msgid "nothing to write in list file for \"%s\""
 #~ msgstr "ingenting at skrive i listefil for \"%s\""
@@ -1605,12 +1771,6 @@ msgstr "ingen fuld media-liste blev fundet"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - udskriv denne hj�lpebesked.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: ukendt parameter \"-%s\", tjek brug med --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: kan ikke l�se rpm-fil \"%s\"\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr "kunne ikke bygge syntese-fil for media \"%s\""
 
@@ -1692,9 +1852,6 @@ msgstr "ingen fuld media-liste blev fundet"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "Forkert proxy-erkl�ring p� kommandolinje\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr ""
 #~ "brug: urpmi.addmedia [valgmuligheder] <navn> <url> [med <relativ_sti>]"
diff --git a/po/de.po b/po/de.po
index 4bcd8ab6..694e76cb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,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: 2002-08-31 14:40+0200\n"
 "Last-Translator: Stefan Siegel <siegel@linux-mandrake.com>\n"
 "Language-Team: German <cooker-i18n@linux-mandrake.com>\n"
@@ -15,1205 +15,1285 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
+#. 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"
+
+#. 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 "Nn"
+
+#: placeholder.h:18
 #, c-format
-msgid "installing %s\n"
+msgid "urpmf version %s"
+msgstr "urpmf Version %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Urheberrecht (C) 1999,2000,2001,2002 MandrakeSoft."
+
+#: placeholder.h:20
+msgid ""
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
 msgstr ""
-" \n"
-"Installiere %s\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
+"Vertrieben werden."
 
-#: ../_irpm_.c:33
-#, c-format
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "Verwendung: urpmf [Optionen] <Datei>"
+
+#: placeholder.h:22
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
-"Automatische Installation von Paketen ...\n"
-"Sie wünschen die Installation von Paket „%s“\n"
+"  --quiet         - Keine Parameter ausgeben (Standard, wenn kein Parameter"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Ist das in Ordnung?"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                   in der Kommandozeile vorgegeben wurde)."
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - Alle Parameter ausgeben."
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Abbruch"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - Ausgabe des Attributs „Name des RPMs“ (Dieses Attribut"
 
-#: ../_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 "Nn"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
+"                   wird angenommen, wenn kein Parameter angegeben wird)"
 
-#: ../_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:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - Ausgabe des Attributs „Größe“."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - Ausgabe des Attributs „Seriennummer“."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - Ausgabe des Attributs „Zusammenfassung“."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - Ausgabe des Attributs „Beschreibung“."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - Ausgabe des Attributs „Stellt zur Verfügung“ (mehrere\n"
+"                           Zeilen möglich)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - Ausgabe des Attributs „Benötigt“ (mehrere Zeilen "
+"möglich)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - Ausgabe des Attribus „Dateien“ (mehrere Zeilen möglich)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - Ausgabe des Attributs „Steht in Konflikt mit“ (mehrere\n"
+"                    Zeilen möglich)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - Ausgabe des Attributs „Macht überflüssig“ (mehrere "
+"Zeilen\n"
+"                    möglich)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - Ausgabe des Attributs „Benötigt zur Installation“\n"
+"                    (mehrere Zeilen möglich)"
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "Mit „urmpf --help“ erhatlen Sie weitere Optionen"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "Es wurde keine komplette Medienliste gefunden"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: Befehl nicht gefunden\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Unbekanntes Programm „%s“ zum Herunterladen der Pakete!!!\n"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "Unbekanntes Protokoll für %s"
+msgid "Cancel"
+msgstr "Abbruch"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Ist das in Ordnung?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"Es ist kein Programm zum Herunterladen der Pakete (momentan unterstützt "
-"werden „curl“ und „wget“) installiert.\n"
+"Automatische Installation von Paketen ...\n"
+"Sie wünschen die Installation von Paket „%s“\n"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "Ich kann mit dem Prtokoll „%s“ nicht umgehen."
+msgid "installing %s\n"
+msgstr ""
+" \n"
+"Installiere %s\n"
 
-#: ../urpm.pm_.c:246
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "... das Kopieren schlug fehl!"
+msgid "unable to open rpmdb"
+msgstr "Die RPM-Datei kann nicht registriert werden."
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget fehlt\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]."
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget-Fehler: Beendet mit Rückgabewert '%d' oder Signal '%d'\n"
+msgid "%s conflicts with %s"
+msgstr "%s steht im Konflikt mit %s."
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl fehlt\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr "%s wird von %s benötigt."
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
-"verwenden, es wird daher ignoriert."
+msgid "unable to install package %s"
+msgstr "Ich kann das Paket „%s“ nicht installeren."
 
-#: ../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 ""
-"Das Medium „%s“ kann nicht verwendet werden, da die Dateiliste bereits von "
-"einem anderen Medium verwendet wird."
+msgid "unable to remove package %s"
+msgstr "Ich kann das Paket „%s“ nicht entfernen."
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"Sie können „%s“ nicht als Name für dieses Medium verwenden, da er bereits "
-"verwendet wird."
+msgid "Preparing..."
+msgstr "Vorbereiten ..."
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"Es ist nicht möglich, das Medium „%s“ zu verwenden, da keine Dateilise [%s] "
-"existiert."
+msgid "...retrieving failed: %s"
+msgstr "...Holen fehlgeschlagen: %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "Konnte Medium dieser HD-Liste nicht bestimmen [%s]"
+msgid "...retrieving done"
+msgstr "...Holen fertig"
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "Holen der RPMs ..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
-"Es ist nicht möglich, auf die HD-Liste „%s“ zuzugreifen,\n"
-"das Medium wird daher ignoriert."
+msgid "malformed input: [%s]"
+msgstr "Inkorrekte Eingabe: [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "Konnte nicht auf Listendatei von „%s“ zugreifen, Medium ignoriert"
+msgid "unable to access medium \"%s\""
+msgstr "Ich kann auf das Medium „%s“ nicht zugreifen."
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "Versuche existierendes Medium „%s“ zu umgehen, vermeidend"
+msgid "urpmi database locked"
+msgstr "Die urpmi-Datenbank wird von einem anderen Prozess blockiert!"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-"Die HD-Liste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "„%s“ wurde als Wechselmedium angegeben, ist es aber nicht."
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-"Die Dateiliste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
+msgid "medium \"%s\" is not selected"
+msgstr "Das Medium „%s“ wurde nicht ausgewählt."
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "Die Dateiliste für „%s“ ist inkonsistent, das Medium wird ignoriert."
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Ich kann das RPM-Paket „%s“ von Medium „%s“ nicht lesen."
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "package %s is not found."
+msgstr "Paket %s wurde nicht gefunden."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
-"Die Dateiliste für „%s“ kann nicht kontrolliert werden, es wird ignoriert."
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "Es existieren zu viele Einhängpunkte für das Wechselmedium „%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:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Verwende Wechselmedium als „%s“"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "Es existieren mehrere Pakete mit dem selben RPM-Dateinamen „%s“"
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Verwendung verschiedener Wechselmedien [%s] für „%s“"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Konnte [%s] beim Wert „%s“ nicht korrekt analysieren."
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Ich kann den Pfadnamen für das Wechselmedium „%s“ nicht finden."
+msgid "The following packages contain %s: %s"
+msgstr "Die folgenden Pakete enthalten „%s“: %s"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden."
+msgid "no package named %s"
+msgstr "Kein Paket namens %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "Schreiben der Konfigurationsdatei [%s]."
+msgid "error registering local packages"
+msgstr "Fehler bei der Registrierung lokaler Pakete"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]."
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "Holen der RPMs ..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "Ich kann „%s“ in Datei [%s] nicht parsen."
+msgid "invalid rpm file name [%s]"
+msgstr "Ungültiger RPM Name [%s]."
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "Prüfen der Parallel-Handler in Datei [%s]"
+msgid "no entries relocated in depslist"
+msgstr "keine Einträge in depslist-Datei verschoben"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "Parallel-Handler für folgende Knoten gefunden: %s"
+msgid "relocated %s entries in depslist"
+msgstr "Verschiebe %s Einträge in Depslist-Datei"
 
-#: ../urpm.pm_.c:780
-#, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "Verwende assoziiertes Medium für den parallelen Modeus: %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "Aushängen von „%s“"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "Ich kann die Parallel-Option „%s“ nicht nutzen."
+msgid "mounting %s"
+msgstr "Einhängen von „%s“"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr ""
-"„--synthesis“ kann nicht mit „--media“, „--update“ oder „--parallel“ "
-"verwendet werden."
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "Entferne %d veraltete Informationen aus dem Cache."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "%d Informationen im Cache gefunden."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "Erstellen der HD-Liste für das Medium „%s“"
 
-#: ../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]"
 msgstr "Prüfen der HD-Liste [%s]"
 
-#: ../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]"
 msgstr "Lesen der Synthese-Datei [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "Lesen der HD-Liste für das Medium „%s“ schlug fehl"
+msgid "building hdlist [%s]"
+msgstr "Erstellen der HD-Liste [%s]."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "Lesen der Paketinformationen des Mediums „%s“."
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr "Zweiter Durchlauf zum Berechnen der Paketabhängigkeiten\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Probleme beim Lesen der Synthese-Datei des Mediums „%s“"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "Die RPM-Datei kann nicht registriert werden."
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "Das Medium „%s“ existiert bereits."
+msgid "nothing written in list file for \"%s\""
+msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "Medium %s hinzugefügt"
+msgid "unable to write list file of \"%s\""
+msgstr "Ich kann die Dateiliste für „%s“ nicht schreiben."
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "Es kann nicht auf das erste Installationsmedium zugegriffen werden."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "Datei [%s] wird bereits im selben Medium „%s“ verwendet."
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "Lesen der HD-Liste ..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Die Struktur der HD-Liste von „%s“ ist nicht korrekt."
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "... das Kopieren ist beendet!"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "... das Kopieren ist beendet!"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "Holen der HD-Liste (oder synthesis-Datei) fehlgeschlagen"
 
-#: ../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)"
-msgstr ""
-"Kein Zugriff auf das erste Installationsmedium (die Datei „Mandrake/base/"
-"hdlists“ wurde nicht gefunden)"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "Prüfen der HD-Liste [%s]"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "Holen der HD-Liste ..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "Kopiere HD-Liste (oder synthesis-Datei) von „%s“ ..."
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...Holen fertig"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "Hole HD-Liste (oder synthesis-Datei) von „%s“..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...Holen fehlgeschlagen: %s"
+msgid "retrieving description file of \"%s\"..."
+msgstr "Holen der Beschreibungsdatei für „%s“ ..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "Fehlerhafte HD-Liste in Datei „%s“"
+msgid "no rpm files found from [%s]"
+msgstr "Keine rpm-Dateien in [%s] gefunden"
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "Versuch, das nicht existierende Medium „%s“ auszuwählen."
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "Ich kann die RPM-Dateien von [%s] nicht lesen: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "„%s“"
+msgid "reading rpm files from [%s]"
+msgstr "Lesen der RPM-Dateien von [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "Auswahl des Mehrfachmediums: %s"
+msgid "...copying done"
+msgstr "... das Kopieren ist beendet!"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "... das Kopieren ist beendet!"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "Entfernen des Mediums „%s“."
+msgid "copying source list of \"%s\"..."
+msgstr "Kopiere Quellen-Liste von „%s“..."
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "Die urpmi-Datenbank wird von einem anderen Prozess blockiert!"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "Kopieren von [%s] schlug fehl."
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Ich kann auf das Medium „%s“ nicht zugreifen."
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "Kopiere HD-Liste (oder synthesis-Datei) von „%s“ ..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Kopiere Beschreibungs-Datei von „%s“..."
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "Kopiere HD-Liste (oder synthesis-Datei) von „%s“ ..."
+msgid "removing medium \"%s\""
+msgstr "Entfernen des Mediums „%s“."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "Kopieren von [%s] schlug fehl."
+msgid "selecting multiple media: %s"
+msgstr "Auswahl des Mehrfachmediums: %s"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "Prüfen der HD-Liste [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
+msgstr "„%s“"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "Kopiere Quellen-Liste von „%s“..."
+msgid "trying to select inexistent medium \"%s\""
+msgstr "Versuch, das nicht existierende Medium „%s“ auszuwählen."
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "Lesen der RPM-Dateien von [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"Kein Zugriff auf das erste Installationsmedium (die Datei „Mandrake/base/"
+"hdlists“ wurde nicht gefunden)"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "Ich kann die RPM-Dateien von [%s] nicht lesen: %s"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "Fehlerhafte HD-Liste in Datei „%s“"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "Keine rpm-Dateien in [%s] gefunden"
+msgid "retrieving hdlists file..."
+msgstr "Holen der HD-Liste ..."
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "Holen der Beschreibungsdatei für „%s“ ..."
+msgid "copying hdlists file..."
+msgstr "Lesen der HD-Liste ..."
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "Hole HD-Liste (oder synthesis-Datei) von „%s“..."
+msgid "unable to access first installation medium"
+msgstr "Es kann nicht auf das erste Installationsmedium zugegriffen werden."
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "Holen der HD-Liste (oder synthesis-Datei) fehlgeschlagen"
+#: ../urpm.pm:1
+#, c-format
+msgid "added medium %s"
+msgstr "Medium %s hinzugefügt"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
+msgid "medium \"%s\" already exists"
+msgstr "Das Medium „%s“ existiert bereits."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "Datei [%s] wird bereits im selben Medium „%s“ verwendet."
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "Lesen der HD-Liste für das Medium „%s“ schlug fehl"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Die Struktur der HD-Liste von „%s“ ist nicht korrekt."
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
+"„--synthesis“ kann nicht mit „--media“, „--update“ oder „--parallel“ "
+"verwendet werden."
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "Ich kann die Dateiliste für „%s“ nicht schreiben."
+msgid "unable to use parallel option \"%s\""
+msgstr "Ich kann die Parallel-Option „%s“ nicht nutzen."
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
+msgid "using associated media for parallel mode: %s"
+msgstr "Verwende assoziiertes Medium für den parallelen Modeus: %s"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "Zweiter Durchlauf zum Berechnen der Paketabhängigkeiten\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "Parallel-Handler für folgende Knoten gefunden: %s"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "Lesen der Paketinformationen des Mediums „%s“."
+msgid "examining parallel handler in file [%s]"
+msgstr "Prüfen der Parallel-Handler in Datei [%s]"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "Erstellen der HD-Liste [%s]."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "Ich kann „%s“ in Datei [%s] nicht parsen."
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "Erstellen der HD-Liste für das Medium „%s“"
+msgid "write config file [%s]"
+msgstr "Schreiben der Konfigurationsdatei [%s]."
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d Informationen im Cache gefunden."
+msgid "unable to write config file [%s]"
+msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden."
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "Entferne %d veraltete Informationen aus dem Cache."
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "Ich kann den Pfadnamen für das Wechselmedium „%s“ nicht finden."
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "Einhängen von „%s“"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "Verwendung verschiedener Wechselmedien [%s] für „%s“"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "Aushängen von „%s“"
+msgid "taking removable device as \"%s\""
+msgstr "Verwende Wechselmedium als „%s“"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "Verschiebe %s Einträge in Depslist-Datei"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "Es existieren zu viele Einhängpunkte für das Wechselmedium „%s“"
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "keine Einträge in depslist-Datei verschoben"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"Die Dateiliste für „%s“ kann nicht kontrolliert werden, es wird ignoriert."
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "Ungültiger RPM Name [%s]."
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "Die Dateiliste für „%s“ ist inkonsistent, das Medium wird ignoriert."
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "Holen der RPMs ..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+"Die Dateiliste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]."
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+"Die HD-Liste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]."
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "Versuche existierendes Medium „%s“ zu umgehen, vermeidend"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "Fehler bei der Registrierung lokaler Pakete"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "Konnte nicht auf Listendatei von „%s“ zugreifen, Medium ignoriert"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "Kein Paket namens %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
+"Es ist nicht möglich, auf die HD-Liste „%s“ zuzugreifen,\n"
+"das Medium wird daher ignoriert."
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Die folgenden Pakete enthalten „%s“: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "Konnte Medium dieser HD-Liste nicht bestimmen [%s]"
 
-#: ../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\""
-msgstr "Es existieren mehrere Pakete mit dem selben RPM-Dateinamen „%s“"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"Es ist nicht möglich, das Medium „%s“ zu verwenden, da keine Dateilise [%s] "
+"existiert."
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "Konnte [%s] beim Wert „%s“ nicht korrekt analysieren."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"Sie können „%s“ nicht als Name für dieses Medium verwenden, da er bereits "
+"verwendet wird."
 
-#: ../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)"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"Das Medium „%s“ kann nicht verwendet werden, da die Dateiliste bereits von "
+"einem anderen Medium verwendet wird."
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
+"Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
+"verwenden, es wird daher ignoriert."
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "Paket %s wurde nicht gefunden."
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"Das Medium „%s“ versucht eine bereits verwendete HD-Liste ebenfalls zu "
+"verwenden, es wird daher ignoriert."
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "Das Medium „%s“ wurde nicht ausgewählt."
+msgid "syntax error in config file at line %s"
+msgstr "Syntax-Fehler in Konfigurationsdatei auf Linie %s"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Ich kann das RPM-Paket „%s“ von Medium „%s“ nicht lesen."
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "„%s“ wurde als Wechselmedium angegeben, ist es aber nicht."
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "Inkorrekte Eingabe: [%s]"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync-Fehler: Beendet mit Rückgabewert %d oder Signal %d\n"
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "Holen der RPMs ..."
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh fehlt\n"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Vorbereiten ..."
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync is missing\n"
+msgstr "rsync fehlt\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "Ich kann das Paket „%s“ nicht entfernen."
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl-Fehler: Beendet mit Rückgabewert %d oder Signal %d\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "Ich kann das Paket „%s“ nicht installeren."
+msgid "curl is missing\n"
+msgstr "curl fehlt\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s wird von %s benötigt."
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget-Fehler: Beendet mit Rückgabewert '%d' oder Signal '%d'\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s steht im Konflikt mit %s."
+msgid "wget is missing\n"
+msgstr "wget fehlt\n"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "... das Kopieren schlug fehl!"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "Ich kann mit dem Prtokoll „%s“ nicht umgehen."
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
+"Es ist kein Programm zum Herunterladen der Pakete (momentan unterstützt "
+"werden „curl“ und „wget“) installiert.\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 "Die Installation auf Knoten „%s“ schlug Fehl"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-msgid "Installation is possible"
-msgstr "Die Installation ist möglich"
-
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
-#, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Die Installation auf Knoten „%s“ schlug Fehl"
+msgid "unknown protocol defined for %s"
+msgstr "Unbekanntes Protokoll für %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr ""
-"Auf dem Knoten „%s“ ist nicht die richtige Version von urpmi installiert!"
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Unbekanntes Programm „%s“ zum Herunterladen der Pakete!!!\n"
 
-#: ../urpme_.c:39
+#: ../urpme:1
 #, fuzzy, 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 ""
-"urpmi Version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
-"Vertrieben werden.\n"
-
-#: ../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         - Diese Hilfe-Botschaft anzeigen.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\n"
+msgid "Removing failed"
+msgstr "... das Kopieren schlug fehl!"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - Versuch, ob die Installation korrekt verlaufen wird.\n"
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete entfernt (%d "
+"MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
-" --parallel     - verteilter urpmi Aufru auf allen teilnehmenden\n"
-"                  Maschinen.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Eines der folgenden Pakete wird benötigt:"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
-"\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Nichts zu entfernen.\n"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: unbekannte Option „-%s“. Bitte Hilfe mit --help nachschlagen\n"
+msgid "removing package %s will break your system"
+msgstr "Das Entfernen des Pakets „%s“ macht Ihr System unbrauchbar.\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "unbekanntes Paket "
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "unbekannte Pakete "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "Das Entfernen des Pakets „%s“ macht Ihr System unbrauchbar.\n"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: unbekannte Option „-%s“. Bitte Hilfe mit --help nachschlagen\n"
 
-#: ../urpme_.c:95
-#, fuzzy
-msgid "Nothing to remove"
-msgstr "Nichts zu entfernen.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
+"\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Eines der folgenden Pakete wird benötigt:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
+" --parallel     - verteilter urpmi Aufru auf allen teilnehmenden\n"
+"                  Maschinen.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete entfernt (%d "
-"MB)"
+"  --test         - Versuch, ob die Installation korrekt verlaufen wird.\n"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "... das Kopieren schlug fehl!"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\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         - Diese Hilfe-Botschaft anzeigen.\n"
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, fuzzy, 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 ""
-"urpmq Version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmi Version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
 "Vertrieben werden.\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
+"\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
-"                   der urpmi-DB.\n"
+"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
+"\n"
 
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - ausführlicher Modus.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
+"  -u             - Entferne Paket wenn eine bessere Version schon "
+"installiert ist.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - Keine Parameter ausgeben (Standard, wenn kein Parameter"
-
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - Alle Parameter ausgeben."
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - Ausgabe des Attributs „Name des RPMs“ (Dieses Attribut"
+"  -u             - Entferne Paket wenn eine bessere Version schon "
+"installiert ist.\n"
 
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - Löschen des Header-Verzeichnisses.\n"
 
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - Ausgabe des Attributs „Größe“."
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - Ausgabe von Version, Release und Architektur mit dem "
+"Namen.\n"
 
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - Ausgabe des Attributs „Größe“."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
 
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - Ausgabe des Attributs „Zusammenfassung“."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+"  --obsoletes     - Ausgabe des Attributs „Macht überflüssig“ (mehrere "
+"Zeilen\n"
+"                    möglich)."
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - Ausgabe des Attributs „Beschreibung“."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+"  --conflicts     - Ausgabe des Attributs „Steht in Konflikt mit“ (mehrere\n"
+"                    Zeilen möglich)."
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
-"  --provides      - Ausgabe des Attributs „Stellt zur Verfügung“ (mehrere\n"
-"                           Zeilen möglich)."
+"  --files         - Ausgabe des Attribus „Dateien“ (mehrere Zeilen möglich)."
 
-#: ../urpmf_.c:47
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 "  --requires      - Ausgabe des Attributs „Benötigt“ (mehrere Zeilen "
 "möglich)."
 
-#: ../urpmf_.c:48
-#, fuzzy
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --files         - Ausgabe des Attribus „Dateien“ (mehrere Zeilen möglich)."
+"  --provides      - Ausgabe des Attributs „Stellt zur Verfügung“ (mehrere\n"
+"                           Zeilen möglich)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr ""
-"  --conflicts     - Ausgabe des Attributs „Steht in Konflikt mit“ (mehrere\n"
-"                    Zeilen möglich)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - Ausgabe des Attributs „Beschreibung“."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - Ausgabe des Attributs „Macht überflüssig“ (mehrere "
-"Zeilen\n"
-"                    möglich)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - Ausgabe des Attributs „Zusammenfassung“."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - Ausgabe des Attributs „Größe“."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - Ausgabe von Version, Release und Architektur mit dem "
-"Namen.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - Ausgabe des Attributs „Größe“."
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - Löschen des Header-Verzeichnisses.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: ../urpmf_.c:54
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -u             - Entferne Paket wenn eine bessere Version schon "
-"installiert ist.\n"
+"  --name          - Ausgabe des Attributs „Name des RPMs“ (Dieses Attribut"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - Alle Parameter ausgeben."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - Keine Parameter ausgeben (Standard, wenn kein Parameter"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  -u             - Entferne Paket wenn eine bessere Version schon "
-"installiert ist.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - ausführlicher Modus.\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
-"\n"
+"  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
+"                   der urpmi-DB.\n"
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
-"\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"Verwendung: urpmi.addmedia [Optionen] <Name> <URL> [mit <relativem Pfad>]>\n"
-"Mit <URL> aus folgender Menge:\n"
-"       file://<Pfad>\n"
-"       ftp://<Login>:<Passwort>@<Rechner>/<Pfad> with <relativer Pfad zur HD-"
-"Liste>\n"
-"       ftp://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
-"       http://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
-"       removable://<Pfad>\n"
-"\n"
-"und [Optionen] aus\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         - Benutze wget um entfernte Dateien zu laden.\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         - Benutze curl um entfernte Dateien zu laden.\n"
+"urpmq Version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"Vertrieben werden.\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "Alles bereits installiert"
 
-#: ../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        - Verwende einen HTTP Proxy, als Standard-Portnummer\n"
-"                   wird 1080 angenommen (Format: <ProxyRechner[:port]>).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Die Installation ist möglich"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - Angabe von Benutzerkennzeichen und Passwort zur\n"
-"                   Authentifizierung gegenüber dem Proxy\n"
-"                   (Format: <Benutzerkennzeichen:Passwort>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Die Installation schlug Fehl"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - Erstellen eines Aktualisierungsmediums.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
 
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - automatisch alle Medien von einem Installations-Medium "
-"erzeugen.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/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 ""
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "Verteile %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
-"                   Erstellung von Fehlerberichten).\n"
+"Installation fehlgeschlagen, einige Dateien fehlen.\n"
+"Sie sollten Ihre urpmi-Datenbank aktualisieren"
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Wollen Sie die Installation fortsetzen?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - Löschen des Header-Verzeichnisses.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Folgenden Pakete haben inkorrekte Signaturen:"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - Suche eine synthesis- oder hdlist-Datei und benutze sie.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Betätigen Sie die Return-Taste, sobald Sie soweit sind ..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Bitte legen Sie das Medium mit Namen „%s“ in Gerät „%s“."
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "Ich kann die Quellpakete nicht finden, Abbruch."
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "Ich kann das Medium „%s“ nicht aktualisieren.\n"
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert (%"
+"d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Sie benötigen Root-Rechte, um die folgenden Abhängigkeiten erfüllen zu "
+"können:\n"
 "%s\n"
-"<relativer Pfad zur HD-Liste> fehlt.\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 ""
+"Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
+"durchführen zu können:\n"
 "%s\n"
-"„with“ fehlt für FTP-Medien.\n"
+"Sind Sie damit einverstanden?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "unrequested"
 msgstr ""
-"Verwendung: urpmi.removemedia [-a] <Name> ...\n"
-"Wobei <Name> das zu entfernende Medium ist.\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - Alle Medien auswählen.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "%s steht im Konflikt mit %s."
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "wget fehlt\n"
+
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"\n"
-"Unbekannte Optionen „%s“\n"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"Es gibt nichts zu entfernen (verwenden Sie „urpmi.addmedia“, \n"
-"um neue Medien hinzuzufügen)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "Ich kann das Paket „%s“ nicht installeren."
 
-#: ../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 ""
-"Was soll entfernt werden?\n"
-"(eins aus %s)\n"
+"Einige der gewünschten Pakete können nicht installiert werden:\n"
+"%s\n"
+"Sind Sie einverstanden?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"Verwendung: urpmi.update [Optionen] <Name> ...\n"
-"Wobei <Name> das zu aktualisierende Medium ist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Ihre Wahl? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - Wählt alle nicht entfernbaren Medien..\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Eines der folgenden Pakete wird benötigt:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - Erzwinge komplette Berechnung der Datei depslist."
-"ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Eines der folgenden Pakete wird zur Installation von %s benötigt:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"Es gibt nichts zu aktualisieren (verwenden Sie „urpmi.addmedia“, \n"
-"um neue Medien hinzuzufügen)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Nur der Systemadministrator darf Pakete installieren."
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"Was soll aktualisiert werden?\n"
-"(eins aus %s)\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"
-msgstr ""
-"urpmi Version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
-"Vertrieben werden.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen."
 
-#: ../urpmi_.c:75
-#, fuzzy
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
-"                   der urpmi-DB.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - Automatische Paketauswahl zur Aktualisierung des "
-"Systems.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: unbekannte Option „-%s“. Bitte Hilfe mit --help nachschlagen\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - unscharfe Suche erzwingen (identisch zu „-y“).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - es folgt ein Quellpaket (identisch zu „-s“).\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "Namen oder rpm-Dateien von der Kommandozeile werden installiert.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - ausführlicher Modus.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - leert zu Begeinn den RPM-Cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stiller Modus.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - es folgt ein Quellpaket (identisch zu „--src“).\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
-"  --force        - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
-"existieren.\n"
+"  -y             - unscharfe Suche erzwingen (identisch zu „--fuzzy“).\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
-"  --allow-nodeps - Erlaube Anwenderbefragung zur Paketinstallation\n"
-"                   ohne Abhängigkeitskontrolle.\n"
+"  -P             - nicht in „Stellt zur Verfügung“ nach dem Paket suchen.\n"
 
-#: ../urpmi_.c:86
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --allow-force  - Erlaube Anwenderbefragung zur Paketinstallation\n"
-"                   ohne Abhängigkeits- und Integritätskontrolle.\n"
+"  -p             - Erlaube Suche in „Stellt zur Verfügung“ nach einem "
+"Paket.\n"
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --bug          - Erstellen eines Fehlerberichts im durch das nächste\n"
-"                   Argument angegebenen Ordner.\n"
+"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
+"\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
-"                   Erstellung von Fehlerberichten).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - benutze X-Oberfläche.\n"
+"  --verify-rpm   - Überprüfung der RPM-Signatur vor der Installation.\n"
+"                   (--no-verify-rpm deaktiviert das Verhalten,\n"
+"                   Voreingestellt: Kontrolle der Signaturen).\n"
 
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
@@ -1221,460 +1301,510 @@ msgstr ""
 "  --best-output  - Benutze beste Oberfläche abhängig von der Umgebung:\n"
 "                   X or Text-Modus.\n"
 
-#: ../urpmi_.c:103
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - benutze X-Oberfläche.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --verify-rpm   - Überprüfung der RPM-Signatur vor der Installation.\n"
-"                   (--no-verify-rpm deaktiviert das Verhalten,\n"
-"                   Voreingestellt: Kontrolle der Signaturen).\n"
-
-#: ../urpmi_.c:106
-#, fuzzy
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
+"  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
+"                   Erstellung von Fehlerberichten).\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
-"\n"
+"  --bug          - Erstellen eines Fehlerberichts im durch das nächste\n"
+"                   Argument angegebenen Ordner.\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  -p             - Erlaube Suche in „Stellt zur Verfügung“ nach einem "
-"Paket.\n"
+"  --proxy-user   - Angabe von Benutzerkennzeichen und Passwort zur\n"
+"                   Authentifizierung gegenüber dem Proxy\n"
+"                   (Format: <Benutzerkennzeichen:Passwort>).\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\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 ""
-"  -P             - nicht in „Stellt zur Verfügung“ nach dem Paket suchen.\n"
+"  --proxy        - Verwende einen HTTP Proxy, als Standard-Portnummer\n"
+"                   wird 1080 angenommen (Format: <ProxyRechner[:port]>).\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
-"  -y             - unscharfe Suche erzwingen (identisch zu „--fuzzy“).\n"
-
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - es folgt ein Quellpaket (identisch zu „--src“).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - stiller Modus.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - ausführlicher Modus.\n"
 
-#: ../urpmi_.c:114
-#, fuzzy
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "Namen oder rpm-Dateien von der Kommandozeile werden installiert.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - Benutze curl um entfernte Dateien zu laden.\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: unbekannte Option „-%s“. Bitte Hilfe mit --help nachschlagen\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - Benutze wget um entfernte Dateien zu laden.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
+"  --allow-force  - Erlaube Anwenderbefragung zur Paketinstallation\n"
+"                   ohne Abhängigkeits- und Integritätskontrolle.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen."
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - Erlaube Anwenderbefragung zur Paketinstallation\n"
+"                   ohne Abhängigkeitskontrolle.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
+"  --force        - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
+"existieren.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Nur der Systemadministrator darf Pakete installieren."
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Eines der folgenden Pakete wird zur Installation von %s benötigt:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - leert zu Begeinn den RPM-Cache.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Eines der folgenden Pakete wird benötigt:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ihre Wahl? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - es folgt ein Quellpaket (identisch zu „-s“).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - unscharfe Suche erzwingen (identisch zu „-y“).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Einige der gewünschten Pakete können nicht installiert werden:\n"
-"%s\n"
-"Sind Sie einverstanden?"
+"  --auto-select  - Automatische Paketauswahl zur Aktualisierung des "
+"Systems.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "Ich kann das Paket „%s“ nicht installeren."
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
+"                   der urpmi-DB.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
+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 Version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"Vertrieben werden.\n"
 
-#: ../urpmi_.c:409
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget fehlt\n"
-
-#: ../urpmi_.c:414
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s steht im Konflikt mit %s."
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "Ich kann das Medium „%s“ nicht aktualisieren.\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "Ich kann das Medium „%s“ nicht anlegen.\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 ""
-"Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
-"durchführen zu können:\n"
 "%s\n"
-"Sind Sie damit einverstanden?"
+"„with“ fehlt für FTP-Medien.\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert (%"
-"d MB)"
+"%s\n"
+"<relativer Pfad zur HD-Liste> fehlt.\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 ""
-"Sie benötigen Root-Rechte, um die folgenden Abhängigkeiten erfüllen zu "
-"können:\n"
 "%s\n"
+"nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "Ich kann die Quellpakete nicht finden, Abbruch."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "Holen der RPMs ..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"Unbekannte Optionen „%s“\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Bitte legen Sie das Medium mit Namen „%s“ in Gerät „%s“."
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Betätigen Sie die Return-Taste, sobald Sie soweit sind ..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Folgenden Pakete haben inkorrekte Signaturen:"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Wollen Sie die Installation fortsetzen?"
-
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (j/N) "
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
 
-#: ../urpmi_.c:548
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
-"Installation fehlgeschlagen, einige Dateien fehlen.\n"
-"Sie sollten Ihre urpmi-Datenbank aktualisieren"
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Die Installation schlug Fehl"
+"  -h             - Suche eine synthesis- oder hdlist-Datei und benutze sie.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "Verteile %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "Alles bereits installiert"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - Löschen des Header-Verzeichnisses.\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"
-"\n"
-"usage:\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"urpmq Version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
-"Vertrieben werden.\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list          - Alle verfügbaren Pakete auflisten.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media    - Alle verfügbaren Medien auflisten.\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../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 ""
-"  --list-nodes    - Alle  für „--parallel“ verfügbaren Knoten\n"
-"                    auflisten.\n"
-
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-media    - Alle verfügbaren Medien auflisten.\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  --headers      - Ausgabe von Header-Informationen über Pakete aus der "
-"urpmi-DB \n"
-"                   in die Standard-Ausgabe (nur root).\n"
+"  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
+"                   Erstellung von Fehlerberichten).\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --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 ""
-"  --sources      - Gib alle Quellpakete vor dem Runterladen an (nur root).\n"
-".\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - Erweitere Anfrage auf Paket-Abhängigkeiten.\n"
-
-#: ../urpmq_.c:64
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"  -u             - Entferne Paket wenn bereits eine aktuellere Version "
-"installiert ist.\n"
+"  --distrib      - automatisch alle Medien von einem Installations-Medium "
+"erzeugen.\n"
 
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr ""
-"                   wird angenommen, wenn kein Parameter angegeben wird)"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - Erstellen eines Aktualisierungsmediums.\n"
 
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
 msgstr ""
-"  -p             - Erlaube Suche in „Stellt zur Verfügung“ nach einem "
-"Paket.\n"
-
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - Ausgabe der Gruppe mit dem Namen.\n"
-
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - Ausgabe von Version und Release mit dem Namen.\n"
+"Verwendung: urpmi.addmedia [Optionen] <Name> <URL> [mit <relativem Pfad>]>\n"
+"Mit <URL> aus folgender Menge:\n"
+"       file://<Pfad>\n"
+"       ftp://<Login>:<Passwort>@<Rechner>/<Pfad> with <relativer Pfad zur HD-"
+"Liste>\n"
+"       ftp://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
+"       http://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
+"       removable://<Pfad>\n"
+"\n"
+"und [Optionen] aus\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  Namen oder rpm-Dateien, die auf der Kommandozeile angegeben wurden werden "
-"abgefragt.\n"
+"Was soll entfernt werden?\n"
+"(eins aus %s)\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
-msgid "--list-nodes can only be used with --parallel"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"„--synthesis“ kann nicht mit „--media“, „--update“ oder „--parallel“ "
-"verwendet werden."
+"Es gibt nichts zu entfernen (verwenden Sie „urpmi.addmedia“, \n"
+"um neue Medien hinzuzufügen)\n"
 
-#: placeholder.h:18
+#: ../urpmi.removemedia:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf Version %s"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - Alle Medien auswählen.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Urheberrecht (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"Verwendung: urpmi.removemedia [-a] <Name> ...\n"
+"Wobei <Name> das zu entfernende Medium ist.\n"
 
-#: placeholder.h:20
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
-"Vertrieben werden."
+"Was soll aktualisiert werden?\n"
+"(eins aus %s)\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "Verwendung: urpmf [Optionen] <Datei>"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"Es gibt nichts zu aktualisieren (verwenden Sie „urpmi.addmedia“, \n"
+"um neue Medien hinzuzufügen)\n"
 
-#: placeholder.h:22
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  --quiet         - Keine Parameter ausgeben (Standard, wenn kein Parameter"
+"  -d             - Erzwinge komplette Berechnung der Datei depslist."
+"ordered.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                   in der Kommandozeile vorgegeben wurde)."
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - Wählt alle nicht entfernbaren Medien..\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - Alle Parameter ausgeben."
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
 
-#: placeholder.h:25
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  --name          - Ausgabe des Attributs „Name des RPMs“ (Dieses Attribut"
+"Verwendung: urpmi.update [Optionen] <Name> ...\n"
+"Wobei <Name> das zu aktualisierende Medium ist.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
-"                   wird angenommen, wenn kein Parameter angegeben wird)"
+"„--synthesis“ kann nicht mit „--media“, „--update“ oder „--parallel“ "
+"verwendet werden."
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: Ich kann das RPM „%s“ nicht lesen.\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - Ausgabe des Attributs „Größe“."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmq: unbekannte Option „-%s“. Weitere Infos erhalten Sie \n"
+"mittels „urpmq --help“\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - Ausgabe des Attributs „Seriennummer“."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+"  Namen oder rpm-Dateien, die auf der Kommandozeile angegeben wurden werden "
+"abgefragt.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - Ausgabe des Attributs „Zusammenfassung“."
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - Ausgabe von Version und Release mit dem Namen.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - Ausgabe des Attributs „Beschreibung“."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - Ausgabe der Gruppe mit dem Namen.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"  --provides      - Ausgabe des Attributs „Stellt zur Verfügung“ (mehrere\n"
-"                           Zeilen möglich)."
+"  -p             - Erlaube Suche in „Stellt zur Verfügung“ nach einem "
+"Paket.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
-"  --requires      - Ausgabe des Attributs „Benötigt“ (mehrere Zeilen "
-"möglich)."
+"                   wird angenommen, wenn kein Parameter angegeben wird)"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --files         - Ausgabe des Attribus „Dateien“ (mehrere Zeilen möglich)."
+"  -u             - Entferne Paket wenn bereits eine aktuellere Version "
+"installiert ist.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - Erweitere Anfrage auf Paket-Abhängigkeiten.\n"
+
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - Ausgabe des Attributs „Steht in Konflikt mit“ (mehrere\n"
-"                    Zeilen möglich)."
+"  --sources      - Gib alle Quellpakete vor dem Runterladen an (nur root).\n"
+".\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletes     - Ausgabe des Attributs „Macht überflüssig“ (mehrere "
-"Zeilen\n"
-"                    möglich)."
+"  --headers      - Ausgabe von Header-Informationen über Pakete aus der "
+"urpmi-DB \n"
+"                   in die Standard-Ausgabe (nur root).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-media    - Alle verfügbaren Medien auflisten.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --prereqs       - Ausgabe des Attributs „Benötigt zur Installation“\n"
-"                    (mehrere Zeilen möglich)"
+"  --list-nodes    - Alle  für „--parallel“ verfügbaren Knoten\n"
+"                    auflisten.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "Mit „urmpf --help“ erhatlen Sie weitere Optionen"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media    - Alle verfügbaren Medien auflisten.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "Es wurde keine komplette Medienliste gefunden"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list          - Alle verfügbaren Pakete auflisten.\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl-Fehler: Beendet mit Rückgabewert %d oder Signal %d\n"
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq Version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"Vertrieben werden.\n"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync fehlt\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Die Installation auf Knoten „%s“ schlug Fehl"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync-Fehler: Beendet mit Rückgabewert %d oder Signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh fehlt\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "Syntax-Fehler in Konfigurationsdatei auf Linie %s"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "Das Medium „%s“ versucht eine bereits verwendete HD-Liste ebenfalls zu "
-#~ "verwenden, es wird daher ignoriert."
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Die Installation auf Knoten „%s“ schlug Fehl"
+
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr ""
+"Auf dem Knoten „%s“ ist nicht die richtige Version von urpmi installiert!"
 
 #~ msgid "Remove them all?"
 #~ msgstr "Alle entfernen?"
@@ -1701,14 +1831,6 @@ msgstr "Es wurde keine komplette Medienliste gefunden"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - Ausgabe dieser Hilfe.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr ""
-#~ "urpmq: unbekannte Option „-%s“. Weitere Infos erhalten Sie \n"
-#~ "mittels „urpmq --help“\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: Ich kann das RPM „%s“ nicht lesen.\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi ist nicht installiert."
 
diff --git a/po/el.po b/po/el.po
index 68367fec..be8eee25 100644
--- a/po/el.po
+++ b/po/el.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: 2001-08-22 22:42+0300\n"
 "Last-Translator: Thanos Kyritsis <djart@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -14,701 +14,827 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "����������� %s\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 "��Yy"
 
-#: ../_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 "��Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmq ������ %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"�������� ����������� �������...\n"
-"�������� ��� ����������� ��� ������� %s\n"
+"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
+"GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "����� �������;"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "�����: urpmf [��������] <������>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "�������"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - ��� �������� �� ����� tag (��' ������� �� ������ tag ��� "
+"����� ���� ������"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "�����"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    �������, �������� �� ��� ��������� interactive)."
 
-#: ../_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 "��Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../_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 "��Yy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - ������ �� ����� tag: ����� ������� rpm (��������������� "
+"�� ��� ����� tag ����"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (�/�) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    ������ ������� ���� ����� ����� �������)."
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: � ������ �� �������\n"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - ������ �� tag group: group."
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - ������ �� ������� ��� tag: �������."
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - ������ �� tag serial: serial."
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - ������ ��� �������� ��� tag: ��������."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - ������ ��� ��������� ��� tag: ���������."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
+"  --provides      - ������ ��� ������� ��� tag: ���� ��� ������� (��������� "
+"�������)."
 
-#: ../urpm.pm_.c:226
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "�������� ����������� ��� hdlist: %s"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - ������ ��� ���������� ��� tag: ���� ��� ���������� "
+"(��������� �������)."
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "� ����������� �������"
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - ������ �� ������ ��� tag: ��� �� ������ (��������� "
+"�������)."
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
+"  --conflicts     - ������ ��� ����������� ��� tag: ���� ��� ����������� "
+"(��������� �������)."
 
-#: ../urpm.pm_.c:288
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
+"  --obsoletes     - ������ �� tag obsoletes: ��� �� obsoletes (��������� "
+"�������)."
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
+"  --prereqs       - ������ ��� �� tag prereqs: ��� �� prereqs (��������� "
+"�������)."
 
-#: ../urpm.pm_.c:556
-#, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "����������� �� urpmf --help ��� ������������ ��������"
+
+#: placeholder.h:40
+msgid "no full media list was found"
 msgstr ""
-"�� ���� \"%s\" ��������� �� �������������� ��� ��� ��������������� �����, �� "
-"���� �� ��������"
 
-#: ../urpm.pm_.c:572
+#: ../_irpm:1
+#, c-format
+msgid "%s: command not found\n"
+msgstr "%s: � ������ �� �������\n"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid " (Y/n) "
+msgstr " (�/�) "
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Cancel"
+msgstr "�����"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "�������"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "����� �������;"
+
+#: ../_irpm:1
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"�������� ������� ��� ����� \"%s\" ����� �� ������ ����� ��� ��������������� "
-"��� ���� ����"
+"�������� ����������� �������...\n"
+"�������� ��� ����������� ��� ������� %s\n"
 
-#: ../urpm.pm_.c:578
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"�������� ������ �������� \"%s\" ��� �� ������� ���� ����� ��� ���������������"
+msgid "installing %s\n"
+msgstr "����������� %s\n"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to open rpmdb"
+msgstr "�������� ���������� ��� rpm �������"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "unable to access rpm file [%s]"
+msgstr "�������� ��������� ��� rpm ������ [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "%s conflicts with %s"
 msgstr ""
-"������� �� ���� �� ���� \"%s\" ��� ������ ����� ��� ������� ������ ������ [%"
-"s]"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "�������� �������� ��� �� ���� ����� ��� ������� hdlist [%s]"
+msgid "%s is needed by %s"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "���� � ����������� ������ �� ������������ ������ ������"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr "���� � ����������� ������ �� ������������ ������ ������"
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� �� ��������"
+msgid "Preparing..."
+msgstr ""
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "�������� [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving done"
+msgstr "�������� [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "�������� [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� ���������"
+msgid "malformed input: [%s]"
+msgstr "��������������� �������: [%s]"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "���������� �������� ���������� ����� \"%s\""
+msgid "unable to access medium \"%s\""
+msgstr "�������� ��������� ��� ���� \"%s\""
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "�������� ������� ��� ������� hdlist ��� �� \"%s\", �� ���� �� ��������"
+msgid "urpmi database locked"
+msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "�������� ������� ������� ������ ��� �� \"%s\", �� ���� �� ��������"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "�� ���� \"%s\" ���� ��������� ��� ����������� ���� ��� �����"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "�� ������� ������ ������ ��� �� \"%s\", �� ���� ���������"
+msgid "medium \"%s\" is not selected"
+msgstr "�� ���� \"%s\" ��� ���� ���������"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "�������� ���������� ������� ������ ��� �� \"%s\", �� ���� �� ��������"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "�������� ��������� ��� rpm ������� [%s] ��� �� ���� \"%s\""
 
-#: ../urpm.pm_.c:690
-#, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "�������� ����������� ��� ����� \"%s\"\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
+msgstr "�� ������ %s ��� �������."
 
-#: ../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 "�������� �������� ������ �� �� ���� ����� rpm ������� \"%s\""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "�������� ����������� ��� ����� \"%s\"\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "�������� �������� ����� ��� [%s] ���� ���� \"%s\""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "�������� �������� ������� ��������� [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "�� �������� ������ ��������� %s: %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "������� ������� ��������� [%s]"
+msgid "no package named %s"
+msgstr "������ ������ �� �� ����� %s"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr "������ ���������� ������� �������"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to register rpm file"
 msgstr "�������� ��������� ��� rpm ������ [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "�������� ������� hdlist [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "�������� [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "����� ����� rpm ������� [%s]"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "�������� ������� hdlist [%s]"
+msgid "no entries relocated in depslist"
+msgstr "������������ %s ������������ ��� depslist"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "relocated %s entries in depslist"
+msgstr "������������ %s ������������ ��� depslist"
 
-#: ../urpm.pm_.c:784
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "�������� ����������� ��� ����� \"%s\"\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "����������� %s"
 
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "�������� �� %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "�������� %d �������� ������������ ��� ��� cache"
 
-#: ../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 "found %d headers in cache"
+msgstr "�������� %d ��������� ��� cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "���������� ������� �������� hdlist ��� �� ���� \"%s\""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "�������� ������� hdlist [%s]"
 
-#: ../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
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "�������� depslist ������� [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
+#, c-format
+msgid "building hdlist [%s]"
+msgstr "���������� hdlist [%s]"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "���������� ������� �������� hdlist ��� �� ���� \"%s\""
+msgid "reading headers from medium \"%s\""
+msgstr "���������� ��������� �� �������� ����� \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
 
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "���������� ������� �������� hdlist ��� �� ���� \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "�������� ���������� ��� rpm �������"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "�� ���� \"%s\" ��� �������"
+msgid "nothing written in list file for \"%s\""
+msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "added medium %s"
-msgstr "���������� ��������� �� �������� ����� \"%s\""
+msgid "writing list file for medium \"%s\""
+msgstr "��� ������� hdlist ������ ��� �� ���� \"%s\""
 
-#: ../urpm.pm_.c:933
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� ���������"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "�������� �������� ������� ������ ��� \"%s\""
 
-#: ../urpm.pm_.c:937
-#, fuzzy
-msgid "copying hdlists file..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "�������� ��������� ��� hdlist ������� ��� \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "��� ������� hdlist ������ ��� �� ���� \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
 msgstr "�������� ������� hdlist [%s]"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying done"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%s\""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "�������� [%s]"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving description file of \"%s\"..."
 msgstr "�������� [%s]"
 
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
-#, fuzzy
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� ���������"
+#: ../urpm.pm:1
+#, c-format
+msgid "no rpm files found from [%s]"
+msgstr "��� �������� rpm ������ ��� �� [%s]"
 
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "�������� [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "�������� ��������� ��� rpm ������� [%s] ��� �� ���� \"%s\""
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-#, fuzzy
-msgid "...retrieving done"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
+msgstr "��� �������� rpm ������ ��� �� [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying done"
 msgstr "�������� [%s]"
 
-#: ../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"
+msgid "...copying failed"
 msgstr "�������� [%s]"
 
-#: ../urpm.pm_.c:975
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%s\""
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "���������� �������� ��� �� �������� ����� \"%s\""
+msgid "copy of [%s] failed"
+msgstr "� ��������� ��� [%s] �������"
 
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "\"%s\""
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%s\""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "���������� �������� ��� �� �������� ����� \"%s\""
+msgid "copying description file of \"%s\"..."
+msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%s\""
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "���������� ��������� �� �������� ����� \"%s\""
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "selecting multiple media: %s"
+msgstr "���������� �������� ��� �� �������� ����� \"%s\""
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "�������� ��������� ��� ���� \"%s\""
+msgid "\"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1163
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "���������� �������� ��� �� �������� ����� \"%s\""
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%s\""
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� ���������"
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "� ��������� ��� [%s] �������"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "�������� ������� hdlist [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving hdlists file..."
+msgstr "�������� [%s]"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%s\""
+msgid "copying hdlists file..."
+msgstr "�������� ������� hdlist [%s]"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "��� �������� rpm ������ ��� �� [%s]"
+msgid "unable to access first installation medium"
+msgstr "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� ���������"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "�������� ��������� ��� rpm ������� [%s] ��� �� ���� \"%s\""
+msgid "added medium %s"
+msgstr "���������� ��������� �� �������� ����� \"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "��� �������� rpm ������ ��� �� [%s]"
+msgid "medium \"%s\" already exists"
+msgstr "�� ���� \"%s\" ��� �������"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "�������� [%s]"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "���������� ������� �������� hdlist ��� �� ���� \"%s\""
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "�������� [%s]"
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpm.pm_.c:1432
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "��� ������� hdlist ������ ��� �� ���� \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "�������� ����������� ��� ����� \"%s\"\n"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1480
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "�������� ��������� ��� hdlist ������� ��� \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "�������� ������� hdlist [%s]"
 
-#: ../urpm.pm_.c:1519
-#, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "�������� �������� ������� ������ ��� \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "�������� ������� hdlist [%s]"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "��� ������� hdlist ������ ��� �� ���� \"%s\""
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "�������� ��������� ��� rpm ������ [%s]"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "������ ��� �������� ��� ������ ������ ��� �� \"%s\""
+msgid "write config file [%s]"
+msgstr "������� ������� ��������� [%s]"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr "�������� �������� ������� ��������� [%s]"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "���������� ��������� �� �������� ����� \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "�������� ����������� ��� ����� \"%s\"\n"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "���������� hdlist [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "���������� ������� �������� hdlist ��� �� ���� \"%s\""
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1647
-#, c-format
-msgid "found %d headers in cache"
-msgstr "�������� %d ��������� ��� cache"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "�������� ����������� ��� ����� \"%s\"\n"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "�������� %d �������� ������������ ��� ��� cache"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "�������� ���������� ������� ������ ��� �� \"%s\", �� ���� �� ��������"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "�������� �� %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "�� ������� ������ ������ ��� �� \"%s\", �� ���� ���������"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "����������� %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "�������� ������� ������� ������ ��� �� \"%s\", �� ���� �� ��������"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "������������ %s ������������ ��� depslist"
-
-#: ../urpm.pm_.c:1834
-#, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "������������ %s ������������ ��� depslist"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "�������� ������� ��� ������� hdlist ��� �� \"%s\", �� ���� �� ��������"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "����� ����� rpm ������� [%s]"
-
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "�������� [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "���������� �������� ���������� ����� \"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "�������� ��������� ��� rpm ������ [%s]"
-
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "�������� ��������� ��� rpm ������ [%s]"
-
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "������ ���������� ������� �������"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� ���������"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "������ ������ �� �� ����� %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "�������� ��������� ��� ������ ������ ��� \"%s\", �� ���� �� ��������"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "�� �������� ������ ��������� %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "�������� �������� ��� �� ���� ����� ��� ������� hdlist [%s]"
 
-#: ../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\""
-msgstr "�������� �������� ������ �� �� ���� ����� rpm ������� \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"������� �� ���� �� ���� \"%s\" ��� ������ ����� ��� ������� ������ ������ [%"
+"s]"
 
-#: ../urpm.pm_.c:2147
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "�������� �������� ����� ��� [%s] ���� ���� \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"�������� ������ �������� \"%s\" ��� �� ������� ���� ����� ��� ���������������"
 
-#: ../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)"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"�������� ������� ��� ����� \"%s\" ����� �� ������ ����� ��� ��������������� "
+"��� ���� ����"
 
-#: ../urpm.pm_.c:2174
-#, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
+"�� ���� \"%s\" ��������� �� �������������� ��� ��� ��������������� �����, �� "
+"���� �� ��������"
 
-#: ../urpm.pm_.c:2183
-#, c-format
-msgid "package %s is not found."
-msgstr "�� ������ %s ��� �������."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"�� ���� \"%s\" ��������� �� �������������� ��� ��� ��������������� hdlist, "
+"�� ���� �� ��������"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "�� ���� \"%s\" ��� ���� ���������"
+msgid "syntax error in config file at line %s"
+msgstr "���������� ����� ��� ������ ��������� ��� ������ %s"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "�������� ��������� ��� rpm ������� [%s] ��� �� ���� \"%s\""
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "�� ���� \"%s\" ���� ��������� ��� ����������� ���� ��� �����"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "��������������� �������: [%s]"
-
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "�������� [%s]"
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "���� � ����������� ������ �� ������������ ������ ������"
-
-#: ../urpm.pm_.c:2457
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "���� � ����������� ������ �� ������������ ������ ������"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "� ����������� �������"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
+msgid "copy failed: %s"
 msgstr "� ����������� �������"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "� ����������� �������"
+msgid "unable to handle protocol: %s"
+msgstr "�������� ����������� ��� hdlist: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../urpme_.c:39
-#, fuzzy, 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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
 msgstr ""
-"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
-"GNU GPL."
-
-#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
-#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:62 ../urpmi_.c:72
-#: ../urpmq_.c:40
-#, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "�������� [%s]"
+
+#: ../urpme:1
+#, fuzzy, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"��� �� ������������� �� ���������� (dependencies), �� �������� ������ �� "
+"������������� (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "��� �� ��� �������� ������� ����������:"
+
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
+msgstr ""
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
-
-#: ../urpme_.c:83
-#, fuzzy
 msgid "unknown package"
 msgstr "������ ������ �� �� ����� %s"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "������ ������ �� �� ����� %s"
 
-#: ../urpme_.c:93
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
+
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  --all           - ������ ��� �� tags."
+
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "��� �� ��� �������� ������� ����������:"
-
-#: ../urpme_.c:105
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
-"��� �� ������������� �� ���������� (dependencies), �� �������� ������ �� "
-"������������� (%d MB)"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "�������� [%s]"
+#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
+#: ../urpmi.update:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, fuzzy, 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"
@@ -717,895 +843,871 @@ msgstr ""
 "���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
 "GNU GPL."
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  --group         - ������ �� tag group: group."
+
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --quiet         - ��� �������� �� ����� tag (��' ������� �� ������ tag ��� "
-"����� ���� ������"
 
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmf_.c:39
-#, fuzzy
-msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --name          - ������ �� ����� tag: ����� ������� rpm (��������������� "
-"�� ��� ����� tag ����"
 
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  --group         - ������ �� tag group: group."
 
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - ������ �� ������� ��� tag: �������."
-
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - ������ �� ������� ��� tag: �������."
-
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - ������ ��� �������� ��� tag: ��������."
-
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - ������ ��� ��������� ��� tag: ���������."
-
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - ������ ��� ������� ��� tag: ���� ��� ������� (��������� "
+"  --obsoletes     - ������ �� tag obsoletes: ��� �� obsoletes (��������� "
 "�������)."
 
-#: ../urpmf_.c:47
-#, fuzzy
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - ������ ��� ���������� ��� tag: ���� ��� ���������� "
+"  --conflicts     - ������ ��� ����������� ��� tag: ���� ��� ����������� "
 "(��������� �������)."
 
-#: ../urpmf_.c:48
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 "  --files         - ������ �� ������ ��� tag: ��� �� ������ (��������� "
 "�������)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - ������ ��� ����������� ��� tag: ���� ��� ����������� "
+"  --requires      - ������ ��� ���������� ��� tag: ���� ��� ���������� "
 "(��������� �������)."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - ������ �� tag obsoletes: ��� �� obsoletes (��������� "
+"  --provides      - ������ ��� ������� ��� tag: ���� ��� ������� (��������� "
 "�������)."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - ������ ��� ��������� ��� tag: ���������."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - ������ ��� �������� ��� tag: ��������."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - ������ �� ������� ��� tag: �������."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - ������ �� ������� ��� tag: �������."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - ������ �� tag group: group."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
+"  --name          - ������ �� ����� tag: ����� ������� rpm (��������������� "
+"�� ��� ����� tag ����"
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
 msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - ��� �������� �� ����� tag (��' ������� �� ������ tag ��� "
+"����� ���� ������"
 
-#: ../urpmf_.c:55
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  --group         - ������ �� tag group: group."
-
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"�����: urpmi.addmedia [--update] <name> <url>\n"
-"���� <url> ����� ��� �� ���\n"
-"       file://<��������>\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"
+"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
+"GNU GPL."
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "��� ����� ��� �������������"
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "� ����������� �������"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "� ����������� �������"
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "���������� ��� ��� ������ ����������� (--force); (�/�) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
+"���������� ��� ����������� ����� ��� ������ ��� ���������� (dependencies); "
+"(�/�) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "����������� %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../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 ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (�/�) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "�� �������� ������ ��������� %s: %s"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "������� enter ���� ����������..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "�������� ����� �� ���� �� ����� \"%s\" ��� ������� [%s]"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr "  --group         - ������ �� tag group: group."
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "�������� ������������ ��� ������� (source) �������, �����������"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - ������ �� tag group: group."
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr ""
+"��� �� ������������� �� ���������� (dependencies), �� �������� ������ �� "
+"������������� (%d MB)"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"do you agree ?"
 msgstr ""
-"%s\n"
-"� <������� �������� ��� hdlist> ������\n"
+"������ ������ ������ �� ��������� ��� �� ������������, ���� ��� "
+"������������� �����\n"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "�������� ����������� ��� ����� \"%s\"\n"
+msgid "unrequested"
+msgstr ""
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "due to conflicts with %s"
 msgstr ""
-"%s\n"
-"� <������� �������� ��� hdlist> ������\n"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+msgid "due to missing %s"
 msgstr ""
-"%s\n"
-"�� `with' ������ ��� �� ftp media\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "�������� ����������� ��� ����� \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"�����: urpmi.removemedia [-a] <�����> ...\n"
-"���� <�����> ����� ��� ����� ���� ��������.\n"
-"   -a    ������� ���� ��� �����.\n"
-"\n"
-"�������� �������� '%s'\n"
 
-#: ../urpmi.removemedia_.c:37
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "���� � ����������� ������ �� ������������ ������ ������"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
-"������ ��� �������� (�������������� urpmi.addmedia ��� �������� �����)\n"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"� ������� ���� �������� ������\n"
-"(��� �� ��� %s)\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "�������, ���� �������, ����������� ����\n"
 
-#: ../urpmi.update_.c:60
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"�����: urpmi.removemedia [-a] <�����> ...\n"
-"���� <�����> ����� ��� ����� ���� ��������.\n"
-"   -a    ������� ���� ��� �����.\n"
-"\n"
-"�������� �������� '%s'\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "���� ����� � ������� ���; (1-%d) "
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "��� �� ��� �������� ������� ����������:"
 
-#: ../urpmi.update_.c:71
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "��� �� ��� �������� ������� ����������:"
 
-#: ../urpmi.update_.c:73
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - ������ �� tag group: group."
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "���� � ����������� ������ �� ������������ ������ ������"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
-"������ ��� ���������� (�������������� urpmi.addmedia ��� �������� �����)\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "�������� �������� ����� ��� [%s] ���� ���� \"%s\""
+
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"� ���������� ���� ���������� ������\n"
-"(��� �� ��� %s)\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1
 #, fuzzy, 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 "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
-"GNU GPL."
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-#, fuzzy
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "                    ������ ������� ���� ����� ����� �������)."
 
-#: ../urpmi_.c:81
-#, fuzzy
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmi_.c:82
-#, fuzzy
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - ������ �� tag group: group."
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:86
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-#, fuzzy
+#: ../urpmi:1
+#, fuzzy, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:103
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\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 ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-#, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - ������ �� tag group: group."
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-#, fuzzy
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  --all           - ������ ��� �� tags."
-
-#: ../urpmi_.c:111 ../urpmq_.c:69
-#, fuzzy
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "                    ������ ������� ���� ����� ����� �������)."
-
-#: ../urpmi_.c:112
-#, fuzzy
-msgid "  -q             - quiet mode.\n"
-msgstr "  --all           - ������ ��� �� tags."
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:197
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:223
-#, fuzzy, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "�������� �������� ����� ��� [%s] ���� ���� \"%s\""
-
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "���� � ����������� ������ �� ������������ ������ ������"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "��� �� ��� �������� ������� ����������:"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "��� �� ��� �������� ������� ����������:"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmi_.c:358
+#: ../urpmi:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "���� ����� � ������� ���; (1-%d) "
-
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "�������, ���� �������, ����������� ����\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:402
+#: ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "���� � ����������� ������ �� ������������ ������ ������"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmi_.c:407
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:409
+#: ../urpmi:1
 #, c-format
-msgid "due to missing %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:414
-#, c-format
-msgid "due to conflicts with %s"
+#: ../urpmi:1
+#, fuzzy, 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"
 msgstr ""
+"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
+"GNU GPL."
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "�������� ����������� ��� ����� \"%s\"\n"
 
-#: ../urpmi_.c:421
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "�������� ����������� ��� ����� \"%s\"\n"
+
+#: ../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 ""
-"������ ������ ������ �� ��������� ��� �� ������������, ���� ��� "
-"������������� �����\n"
+"%s\n"
+"�� `with' ������ ��� �� ftp media\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"��� �� ������������� �� ���������� (dependencies), �� �������� ������ �� "
-"������������� (%d MB)"
+"%s\n"
+"� <������� �������� ��� hdlist> ������\n"
 
-#: ../urpmi_.c:463
-#, c-format
+#: ../urpmi.addmedia:1
+#, fuzzy, 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 ""
+"%s\n"
+"� <������� �������� ��� hdlist> ������\n"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "�������� ������������ ��� ������� (source) �������, �����������"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "�������� [%s]"
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:507
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "�������� ����� �� ���� �� ����� \"%s\" ��� ������� [%s]"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - ������ �� tag group: group."
 
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "������� enter ���� ����������..."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr "  --group         - ������ �� tag group: group."
 
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "�� �������� ������ ��������� %s: %s"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (�/�) "
-
-#: ../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"
+"  --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 ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "� ����������� �������"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "����������� %s\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../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 ""
-"���������� ��� ����������� ����� ��� ������ ��� ���������� (dependencies); "
-"(�/�) "
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "���������� ��� ��� ������ ����������� (--force); (�/�) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "��� ����� ��� �������������"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: ../urpmq_.c:35
+#: ../urpmi.addmedia:1
 #, fuzzy, 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 ""
-"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
-"GNU GPL."
-
-#: ../urpmq_.c:46
-#, fuzzy
-msgid "  --list         - list available packages.\n"
-msgstr "  --all           - ������ ��� �� tags."
+"�����: urpmi.addmedia [--update] <name> <url>\n"
+"���� <url> ����� ��� �� ���\n"
+"       file://<��������>\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"
 
-#: ../urpmq_.c:47
-#, fuzzy
-msgid "  --list-media   - list available media.\n"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"� ������� ���� �������� ������\n"
+"(��� �� ��� %s)\n"
 
-#: ../urpmq_.c:48
-#, fuzzy
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"������ ��� �������� (�������������� urpmi.addmedia ��� �������� �����)\n"
 
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, fuzzy, c-format
+msgid "  -a             - select all media.\n"
 msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, fuzzy, 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 ""
+"�����: urpmi.removemedia [-a] <�����> ...\n"
+"���� <�����> ����� ��� ����� ���� ��������.\n"
+"   -a    ������� ���� ��� �����.\n"
+"\n"
+"�������� �������� '%s'\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 ""
+"� ���������� ���� ���������� ������\n"
+"(��� �� ��� %s)\n"
 
-#: ../urpmq_.c:63
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    ������ ������� ���� ����� ����� �������)."
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"������ ��� ���������� (�������������� urpmi.addmedia ��� �������� �����)\n"
 
-#: ../urpmq_.c:64
-#, fuzzy
+#: ../urpmi.update:1
+#, fuzzy, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "                    ������ ������� ���� ����� ����� �������)."
-
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    ������ ������� ���� ����� ����� �������)."
-
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr "  --group         - ������ �� tag group: group."
 
-#: ../urpmq_.c:70
-#, fuzzy
-msgid "  -g             - print groups with name also.\n"
-msgstr "  --group         - ������ �� tag group: group."
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmq_.c:71
-#, fuzzy
-msgid "  -r             - print version and release with name also.\n"
-msgstr "                    ������ ������� ���� ����� ����� �������)."
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"�����: urpmi.removemedia [-a] <�����> ...\n"
+"���� <�����> ����� ��� ����� ���� ��������.\n"
+"   -a    ������� ���� ��� �����.\n"
+"\n"
+"�������� �������� '%s'\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - ������ ��� �� tags."
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmq ������ %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: �������� ��������� rpm ������� \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
-"GNU GPL."
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "�����: urpmf [��������] <������>"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "                    ������ ������� ���� ����� ����� �������)."
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - ��� �������� �� ����� tag (��' ������� �� ������ tag ��� "
-"����� ���� ������"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  --group         - ������ �� tag group: group."
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    �������, �������� �� ��� ��������� interactive)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  --group         - ������ �� tag group: group."
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - ������ ��� �� tags."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    ������ ������� ���� ����� ����� �������)."
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr ""
-"  --name          - ������ �� ����� tag: ����� ������� rpm (��������������� "
-"�� ��� ����� tag ����"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "                    ������ ������� ���� ����� ����� �������)."
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr "                    ������ ������� ���� ����� ����� �������)."
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - ������ �� tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - ������ �� ������� ��� tag: �������."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - ������ �� tag serial: serial."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - ������ ��� �������� ��� tag: ��������."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - ������ ��� ��������� ��� tag: ���������."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr ""
-"  --provides      - ������ ��� ������� ��� tag: ���� ��� ������� (��������� "
-"�������)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --all           - ������ ��� �� tags."
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, 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"
+"\n"
+"usage:\n"
 msgstr ""
-"  --requires      - ������ ��� ���������� ��� tag: ���� ��� ���������� "
-"(��������� �������)."
+"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
+"GNU GPL."
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --files         - ������ �� ������ ��� tag: ��� �� ������ (��������� "
-"�������)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "� ����������� �������"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
-"  --conflicts     - ������ ��� ����������� ��� tag: ���� ��� ����������� "
-"(��������� �������)."
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
-"  --obsoletes     - ������ �� tag obsoletes: ��� �� obsoletes (��������� "
-"�������)."
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
-"  --prereqs       - ������ ��� �� tag prereqs: ��� �� prereqs (��������� "
-"�������)."
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "����������� �� urpmf --help ��� ������������ ��������"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "� ����������� �������"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "���������� ����� ��� ������ ��������� ��� ������ %s"
-
-#, fuzzy
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "�� ���� \"%s\" ��������� �� �������������� ��� ��� ��������������� "
-#~ "hdlist, �� ���� �� ��������"
-
 #~ msgid "nothing to write in list file for \"%s\""
 #~ msgstr "������ ��� ������� ��� ������ ������ ��� �� \"%s\""
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr ""
-#~ "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: �������� ��������� rpm ������� \"%s\"\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "�� urpmi ��� ����� �������������"
 
diff --git a/po/eo.po b/po/eo.po
index 2a99a9af..287db2ad 100644
--- a/po/eo.po
+++ b/po/eo.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: 2001-09-14 07:50-0500\n"
 "Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -13,687 +13,815 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instalas %s\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 "Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmq versio %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Kopirajtita (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 ""
-"Aŭtomata instalado de pakaĵoj...\n"
-"Vi petis instaladon de pakaĵo %s\n"
+"Ĉi tiu estas libera programo kaj vi rajtas redistribui ĝi sub la kondiĉoj\n"
+"de la GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Ĉu tio estas bona?"
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "uzado: urpmf [<opcioj>] <dosiero>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Jes"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - ne printu etikedonomon (defaŭlto se neniu etikedo estas"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Nuligu"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    donata en ordonolinio en interaga reĝimo)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../_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          - printu etikedonomon: rpm-an dosieronomon (supozata se "
+"neniu"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - printu etikedan grupon: group."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --group         - printu etikedan grandecon: size."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --group         - printu etikedan serian: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --group         - printu etikedan resumon: summary."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --group         - printu etikedan priskribon: description."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - printu etikedan provizon: ĉiuj provizoj (pluraj linioj)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - printu etikedan postulon: ĉiuj postuloj (pluraj linioj)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - printu etikedajn dosierojn: ĉiuj dosieroj (pluraj "
+"linioj)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj (pluraj "
+"linioj)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj (pluraj "
+"linioj)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - printu etikedajn antaŭkondiĉojn: ĉiuj antaŭkondiĉoj "
+"(pluraj linioj)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "provu `urpmf --help' por pli da opcioj"
 
-#: ../_irpm_.c:63
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr ""
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: ordono ne trovata\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+msgid "Cancel"
+msgstr "Nuligu"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Jes"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Ĉu tio estas bona?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Aŭtomata instalado de pakaĵoj...\n"
+"Vi petis instaladon de pakaĵo %s\n"
 
-#: ../urpm.pm_.c:226
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ne povis konstrui \"hdlist\": %s"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instalas %s\n"
 
-#: ../urpm.pm_.c:246
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "Instalado malsukcesis"
+msgid "unable to open rpmdb"
+msgstr "ne povis registri rpm-an dosieron"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "ne povis atingi rpm-an dosieron [%s]"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
 msgstr ""
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "medio \"%s\" provis uzi jam uzitan liston, ignoras medion"
+msgid "unable to install package %s"
+msgstr "Nur superuzulo rajtas instali lokajn pakaĵojn"
 
-#: ../urpm.pm_.c:572
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "ne povis trakti pri medion \"%s\" ĉar alia medio jam uzas listdosieron"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr "Nur superuzulo rajtas instali lokajn pakaĵojn"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "ne povis uzi nomon \"%s\" por sennoma medio ĉar ĝi jam estas uzata"
+msgid "Preparing..."
+msgstr ""
 
-#: ../urpm.pm_.c:585
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "ne povis konsideri medion \"%s\" ĉar ne ekzistas listdosieron [%s]"
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "reprenas [%s]"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne povis determini medion de ĉi tiu \"hdlist\" dosiero [%s]"
+msgid "...retrieving done"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
+msgid "malformed input: [%s]"
+msgstr "malbone formata enigo: [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
+msgid "unable to access medium \"%s\""
+msgstr "ne povis atingi medion \"%s\""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "provas ĉirkaŭiri ekzistantan medion \"%s:, evitas"
+msgid "urpmi database locked"
+msgstr ""
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne povis trovi \"hdlist\"-an dosieron por \"%s\", ignoris medion"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ne povis trovi listdosieron por \"%s\", ignoris medion"
+msgid "medium \"%s\" is not selected"
+msgstr "medio \"%s\" ne estas elektata"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nekohera listdosiero por \"%s\", medio ignorita"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne povas inspekti listdosieron por \"%s\", ignoris medion"
+msgid "package %s is not found."
+msgstr "pakaĵo %s ne estis trovata."
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%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:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
+"ekzistas plurajn pakaĵojn kiuj havas la saman rpm-an dosiernomon \"%s\""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne povis krei medion \"%s\"\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ne povis ĝuste analizi [%s] je valoro \"%s\""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ne povas skribi konfigurodosieron [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "skribu konfiguran dosieron [%s]"
+msgid "no package named %s"
+msgstr "neniu pakaĵo nomata %s"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr "eraro dum registri lokajn pakaĵojn"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to register rpm file"
 msgstr "ne povis atingi rpm-an dosieron [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "nevalida rpm-a dosiernomo [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr ""
+msgid "invalid rpm file name [%s]"
+msgstr "nevalida rpm-a dosiernomo [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no entries relocated in depslist"
+msgstr "translokigis %s enskribaĵojn en \"depslist\""
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr ""
+msgid "relocated %s entries in depslist"
+msgstr "translokigis %s enskribaĵojn en \"depslist\""
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "unmounting %s"
+msgstr "malmuntas %s"
 
-#: ../urpm.pm_.c:784
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ne povis analizi hdlist dosieron de \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "muntas %s"
 
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "forigas %d jam ne uzatajn ĉapdosierojn en kaŝejo"
 
-#: ../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 "found %d headers in cache"
+msgstr "trovis %d ĉapdosierojn en kaŝejo"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "legu \"depslist\" dosieron [%s]"
 
-#: ../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
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "legu \"depslist\" dosieron [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
+#, c-format
+msgid "building hdlist [%s]"
+msgstr "konstruas \"hdlist\" [%s]"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
+msgid "reading headers from medium \"%s\""
+msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "ne povis registri rpm-an dosieron"
+#: ../urpm.pm:1
+#, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr "skribis nenion en listdosiero por \"%s\""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medio \"%s\" jam ekzistas"
+msgid "unable to write list file of \"%s\""
+msgstr "ne povis skribi listdosieron de \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:933
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ne povis analizi hdlist dosieron de \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 
-#: ../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 "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "Instalado malsukcesis"
-
-#: ../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 "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:1
+#, c-format
+msgid "found probed hdlist (or synthesis) as %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 "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "reprenas [%s]"
-
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "provas elekti neekzistantan medion \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
 
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "\"%s\""
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
+msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "Instalado malsukcesis"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "kopiado de [%s] malsukcesis"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne povis atingi medion \"%s\""
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "skribis nenion en listdosiero por \"%s\""
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "kopiado de [%s] malsukcesis"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1248
-#, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "provas elekti neekzistantan medion \"%s\""
 
-#: ../urpm.pm_.c:1267
-#, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access first installation medium"
+msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "medio \"%s\" jam ekzistas"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "problem reading hdlist file of medium \"%s\""
 msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "  --all           - printu ĉiujn etikedojn."
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "ne povis analizi hdlist dosieron de \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ne povis analizi hdlist dosieron de \"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr ""
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ne povis skribi listdosieron de \"%s\""
+msgid "examining parallel handler in file [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ne povis atingi rpm-an dosieron [%s]"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "skribis nenion en listdosiero por \"%s\""
+msgid "write config file [%s]"
+msgstr "skribu konfiguran dosieron [%s]"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr "ne povas skribi konfigurodosieron [%s]"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne povis krei medion \"%s\"\n"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "konstruas \"hdlist\" [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "trovis %d ĉapdosierojn en kaŝejo"
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "forigas %d jam ne uzatajn ĉapdosierojn en kaŝejo"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ne povas inspekti listdosieron por \"%s\", ignoris medion"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "muntas %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nekohera listdosiero por \"%s\", medio ignorita"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "malmuntas %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ne povis trovi listdosieron por \"%s\", ignoris medion"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "translokigis %s enskribaĵojn en \"depslist\""
-
-#: ../urpm.pm_.c:1834
-#, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "translokigis %s enskribaĵojn en \"depslist\""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne povis trovi \"hdlist\"-an dosieron por \"%s\", ignoris medion"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nevalida rpm-a dosiernomo [%s]"
-
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "nevalida rpm-a dosiernomo [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "provas ĉirkaŭiri ekzistantan medion \"%s:, evitas"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne povis atingi rpm-an dosieron [%s]"
-
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ne povis atingi rpm-an dosieron [%s]"
-
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "eraro dum registri lokajn pakaĵojn"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "neniu pakaĵo nomata %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne povis determini medion de ĉi tiu \"hdlist\" dosiero [%s]"
 
-#: ../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\""
-msgstr ""
-"ekzistas plurajn pakaĵojn kiuj havas la saman rpm-an dosiernomon \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "ne povis konsideri medion \"%s\" ĉar ne ekzistas listdosieron [%s]"
 
-#: ../urpm.pm_.c:2147
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ne povis ĝuste analizi [%s] je valoro \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "ne povis uzi nomon \"%s\" por sennoma medio ĉar ĝi jam estas uzata"
 
-#: ../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)"
-msgstr ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "ne povis trakti pri medion \"%s\" ĉar alia medio jam uzas listdosieron"
 
-#: ../urpm.pm_.c:2174
-#, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "medio \"%s\" provis uzi jam uzitan liston, ignoras medion"
 
-#: ../urpm.pm_.c:2183
-#, c-format
-msgid "package %s is not found."
-msgstr "pakaĵo %s ne estis trovata."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "medio \"%s\" provis uzi jam uzitan liston, ignoras medion"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medio \"%s\" ne estas elektata"
+msgid "syntax error in config file at line %s"
+msgstr "sintakseraro en konfigura dosiero ĉe linio %s"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "malbone formata enigo: [%s]"
-
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "Nur superuzulo rajtas instali lokajn pakaĵojn"
-
-#: ../urpm.pm_.c:2457
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Nur superuzulo rajtas instali lokajn pakaĵojn"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalado malsukcesis"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
+msgid "copy failed: %s"
 msgstr "Instalado malsukcesis"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Instalado malsukcesis"
+msgid "unable to handle protocol: %s"
+msgstr "ne povis konstrui \"hdlist\": %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../urpme_.c:39
-#, fuzzy, 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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
 msgstr ""
-"Ĉi tiu estas libera programo kaj vi rajtas redistribui ĝi sub la kondiĉoj\n"
-"de la GNU GPL."
-
-#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
-#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:62 ../urpmi_.c:72
-#: ../urpmq_.c:40
-#, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "reprenas [%s]"
+
+#: ../urpme:1
+#, fuzzy, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas instalonta (%d mb)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
+
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
+msgstr ""
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
-
-#: ../urpme_.c:83
-#, fuzzy
 msgid "unknown package"
 msgstr "neniu pakaĵo nomata %s"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "neniu pakaĵo nomata %s"
 
-#: ../urpme_.c:93
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
+
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
+
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
+#: ../urpmi.update:1 ../urpmq:1
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
-msgstr "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas instalonta (%d mb)"
-
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "reprenas [%s]"
+msgid "  --help         - print this help message.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, fuzzy, 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"
@@ -702,879 +830,864 @@ msgstr ""
 "Ĉi tiu estas libera programo kaj vi rajtas redistribui ĝi sub la kondiĉoj\n"
 "de la GNU GPL."
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  --group         - printu etikedan grupon: group."
+
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --quiet         - ne printu etikedonomon (defaŭlto se neniu etikedo estas"
 
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmf_.c:39
-#, fuzzy
-msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --name          - printu etikedonomon: rpm-an dosieronomon (supozata se "
-"neniu"
 
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  --group         - printu etikedan grupon: group."
 
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --group         - printu etikedan grandecon: size."
-
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --group         - printu etikedan grandecon: size."
-
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --group         - printu etikedan resumon: summary."
-
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --group         - printu etikedan priskribon: description."
-
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - printu etikedan provizon: ĉiuj provizoj (pluraj linioj)."
+"  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj (pluraj "
+"linioj)."
 
-#: ../urpmf_.c:47
-#, fuzzy
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - printu etikedan postulon: ĉiuj postuloj (pluraj linioj)."
+"  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj (pluraj "
+"linioj)."
 
-#: ../urpmf_.c:48
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 "  --files         - printu etikedajn dosierojn: ĉiuj dosieroj (pluraj "
 "linioj)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj (pluraj "
-"linioj)."
+"  --requires      - printu etikedan postulon: ĉiuj postuloj (pluraj linioj)."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj (pluraj "
-"linioj)."
+"  --provides      - printu etikedan provizon: ĉiuj provizoj (pluraj linioj)."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --group         - printu etikedan priskribon: description."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --group         - printu etikedan resumon: summary."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --group         - printu etikedan grandecon: size."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --group         - printu etikedan grandecon: size."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - printu etikedan grupon: group."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
+"  --name          - printu etikedonomon: rpm-an dosieronomon (supozata se "
+"neniu"
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
 msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - ne printu etikedonomon (defaŭlto se neniu etikedo estas"
 
-#: ../urpmf_.c:55
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  --group         - printu etikedan grupon: group."
-
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"uzado: urpmi.addmedia [--update] <nomo> <url>\n"
-"kie <url> estas unu el\n"
-"       file://<dosierindiko>\n"
-"       ftp://<salutnomo>:<pasvorto>@<servilo>/dosierindiko> with <relativa "
-"dosieronomo de hd-listo>\n"
-"       ftp://<servilo>/dosierindiko> with <relativa dosieronomo de hd-"
-"listo>\n"
-"       http://<servilo>/dosierindiko> with <relativa dosieronomo de hd-"
-"listo>\n"
-"       removable_<aparato>://<dosierindiko>\n"
+"Ĉi tiu estas libera programo kaj vi rajtas redistribui ĝi sub la kondiĉoj\n"
+"de la GNU GPL."
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "ĉio jam instalita"
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Instalado malsukcesis"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalado malsukcesis"
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "instalas %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../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 ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Premu la enigklavon kiam ĝi estas finata..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparato [%s]"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr "  --group         - printu etikedan grupon: group."
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "Ne povas preni fontajn pakaĵojn.  Mi ĉesiĝas."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --group         - printu etikedan grupon: group."
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas instalonta (%d mb)"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"do you agree ?"
 msgstr ""
-"%s\n"
-"<relativa dosieronomo de hd-listo> mankas\n"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne povis ĝisdatigi medion \"%s\"\n"
+"Por ĝisdatigi, iu pakaĵo devas esti forprenata.  Ĉi tiu ne jam estas "
+"subtenata.\n"
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "unrequested"
 msgstr ""
-"%s\n"
-"<relativa dosieronomo de hd-listo> mankas\n"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+msgid "due to conflicts with %s"
 msgstr ""
-"%s\n"
-"`with' mankanta por ftp medio\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne povis krei medion \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "due to missing %s"
 msgstr ""
-"uzado: urpmi.removemedia [-a] <nomo> ...\n"
-"kie <nomo> estas nomo de medio por depreni.\n"
-"   -a    elektu ĉiujn mediojn.\n"
-"\n"
-"nekonataj opcioj '%s'\n"
-
-#: ../urpmi.removemedia_.c:37
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nenio por forpreni (uzu urpmi.addmedia por aldoni medion)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "Nur superuzulo rajtas instali lokajn pakaĵojn"
 
-#: ../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 ""
-"la enskribaĵo por forpreni mankas\n"
-"(unu el %s)\n"
 
-#: ../urpmi.update_.c:60
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"uzado: urpmi.removemedia [-a] <nomo> ...\n"
-"kie <nomo> estas nomo de medio por depreni.\n"
-"   -a    elektu ĉiujn mediojn.\n"
-"\n"
-"nekonataj opcioj '%s'\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Bedaŭrinde, nevalida elekto, reprovu\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Kiu estas via elekto? (1-%d) "
 
-#: ../urpmi.update_.c:71
-#, fuzzy
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
 
-#: ../urpmi.update_.c:73
-#, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  --group         - printu etikedan grupon: group."
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Unu el la sekvantaj pakaĵoj estas bezonata por instali %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nenio por ĝisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Nur superuzulo rajtas instali lokajn pakaĵojn"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"la enskribaĵo por ĝisgatigi mankas\n"
-"(unu el %s)\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1
 #, fuzzy, 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"
-msgstr ""
-"Ĉi tiu estas libera programo kaj vi rajtas redistribui ĝi sub la kondiĉoj\n"
-"de la GNU GPL."
+msgid "Unable to create directory [%s] for bug report"
+msgstr "ne povis ĝuste analizi [%s] je valoro \"%s\""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-#, fuzzy
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-#, fuzzy
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmi_.c:82
-#, fuzzy
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
+
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  --group         - printu etikedan grupon: group."
+
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:86
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-#, fuzzy
+#: ../urpmi:1
+#, fuzzy, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:103
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\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 ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-#, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  --group         - printu etikedan grupon: group."
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-#, fuzzy
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
-
-#: ../urpmi_.c:111 ../urpmq_.c:69
-#, fuzzy
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
-
-#: ../urpmi_.c:112
-#, fuzzy
-msgid "  -q             - quiet mode.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:223
-#, fuzzy, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "ne povis ĝuste analizi [%s] je valoro \"%s\""
-
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Nur superuzulo rajtas instali lokajn pakaĵojn"
-
-#: ../urpmi_.c:349
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Unu el la sekvantaj pakaĵoj estas bezonata por instali %s:"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmi_.c:358
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kiu estas via elekto? (1-%d) "
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Bedaŭrinde, nevalida elekto, reprovu\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:402
+#: ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "Nur superuzulo rajtas instali lokajn pakaĵojn"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmi_.c:407
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:409
+#: ../urpmi:1
 #, c-format
-msgid "due to missing %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:414
-#, c-format
-msgid "due to conflicts with %s"
+#: ../urpmi:1
+#, fuzzy, 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"
 msgstr ""
+"Ĉi tiu estas libera programo kaj vi rajtas redistribui ĝi sub la kondiĉoj\n"
+"de la GNU GPL."
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne povis ĝisdatigi medion \"%s\"\n"
 
-#: ../urpmi_.c:421
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne povis krei medion \"%s\"\n"
+
+#: ../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 ""
-"Por ĝisdatigi, iu pakaĵo devas esti forprenata.  Ĉi tiu ne jam estas "
-"subtenata.\n"
+"%s\n"
+"`with' mankanta por ftp medio\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 "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas instalonta (%d mb)"
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
+"%s\n"
+"<relativa dosieronomo de hd-listo> mankas\n"
 
-#: ../urpmi_.c:463
-#, c-format
+#: ../urpmi.addmedia:1
+#, fuzzy, 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 ""
+"%s\n"
+"<relativa dosieronomo de hd-listo> mankas\n"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "Ne povas preni fontajn pakaĵojn.  Mi ĉesiĝas."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "nevalida rpm-a dosiernomo [%s]"
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:507
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparato [%s]"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group         - printu etikedan grupon: group."
 
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Premu la enigklavon kiam ĝi estas finata..."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr "  --group         - printu etikedan grupon: group."
 
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (J/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"
+"  --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 ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instalado malsukcesis"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "instalas %s\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
+#: ../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 ""
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "ĉio jam instalita"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: ../urpmq_.c:35
+#: ../urpmi.addmedia:1
 #, fuzzy, 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 ""
-"Ĉi tiu estas libera programo kaj vi rajtas redistribui ĝi sub la kondiĉoj\n"
-"de la GNU GPL."
-
-#: ../urpmq_.c:46
-#, fuzzy
-msgid "  --list         - list available packages.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
+"uzado: urpmi.addmedia [--update] <nomo> <url>\n"
+"kie <url> estas unu el\n"
+"       file://<dosierindiko>\n"
+"       ftp://<salutnomo>:<pasvorto>@<servilo>/dosierindiko> with <relativa "
+"dosieronomo de hd-listo>\n"
+"       ftp://<servilo>/dosierindiko> with <relativa dosieronomo de hd-"
+"listo>\n"
+"       http://<servilo>/dosierindiko> with <relativa dosieronomo de hd-"
+"listo>\n"
+"       removable_<aparato>://<dosierindiko>\n"
 
-#: ../urpmq_.c:47
-#, fuzzy
-msgid "  --list-media   - list available media.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"la enskribaĵo por forpreni mankas\n"
+"(unu el %s)\n"
 
-#: ../urpmq_.c:48
-#, fuzzy
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nenio por forpreni (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, fuzzy, c-format
+msgid "  -a             - select all media.\n"
 msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, fuzzy, 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 ""
+"uzado: urpmi.removemedia [-a] <nomo> ...\n"
+"kie <nomo> estas nomo de medio por depreni.\n"
+"   -a    elektu ĉiujn mediojn.\n"
+"\n"
+"nekonataj opcioj '%s'\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 ""
+"la enskribaĵo por ĝisgatigi mankas\n"
+"(unu el %s)\n"
 
-#: ../urpmq_.c:63
-#, fuzzy
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nenio por ĝisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: ../urpmq_.c:64
-#, fuzzy
+#: ../urpmi.update:1
+#, fuzzy, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
-
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
-
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr "  --group         - printu etikedan grupon: group."
 
-#: ../urpmq_.c:70
-#, fuzzy
-msgid "  -g             - print groups with name also.\n"
-msgstr "  --group         - printu etikedan grupon: group."
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmq_.c:71
-#, fuzzy
-msgid "  -r             - print version and release with name also.\n"
-msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"uzado: urpmi.removemedia [-a] <nomo> ...\n"
+"kie <nomo> estas nomo de medio por depreni.\n"
+"   -a    elektu ĉiujn mediojn.\n"
+"\n"
+"nekonataj opcioj '%s'\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmq versio %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Kopirajtita (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"Ĉi tiu estas libera programo kaj vi rajtas redistribui ĝi sub la kondiĉoj\n"
-"de la GNU GPL."
 
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "uzado: urpmf [<opcioj>] <dosiero>"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - ne printu etikedonomon (defaŭlto se neniu etikedo estas"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  --group         - printu etikedan grupon: group."
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    donata en ordonolinio en interaga reĝimo)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  --group         - printu etikedan grupon: group."
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - printu ĉiujn etikedojn."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr ""
-"  --name          - printu etikedonomon: rpm-an dosieronomon (supozata se "
-"neniu"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr "                    etikedo donata en ordonolinio sed sen pakaĵnomo)."
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - printu etikedan grupon: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --group         - printu etikedan grandecon: size."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --group         - printu etikedan serian: serial."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --group         - printu etikedan resumon: summary."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --group         - printu etikedan priskribon: description."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr ""
-"  --provides      - printu etikedan provizon: ĉiuj provizoj (pluraj linioj)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --all           - printu ĉiujn etikedojn."
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, 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"
+"\n"
+"usage:\n"
 msgstr ""
-"  --requires      - printu etikedan postulon: ĉiuj postuloj (pluraj linioj)."
+"Ĉi tiu estas libera programo kaj vi rajtas redistribui ĝi sub la kondiĉoj\n"
+"de la GNU GPL."
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --files         - printu etikedajn dosierojn: ĉiuj dosieroj (pluraj "
-"linioj)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalado malsukcesis"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
-"  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj (pluraj "
-"linioj)."
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
-"  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj (pluraj "
-"linioj)."
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
-"  --prereqs       - printu etikedajn antaŭkondiĉojn: ĉiuj antaŭkondiĉoj "
-"(pluraj linioj)."
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "provu `urpmf --help' por pli da opcioj"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Instalado malsukcesis"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "sintakseraro en konfigura dosiero ĉe linio %s"
-
 #~ msgid "nothing to write in list file for \"%s\""
 #~ msgstr "nenio por skribi en listdosiero por \"%s\""
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi ne estas instalata"
 
diff --git a/po/es.po b/po/es.po
index 1c9f8eae..18471e85 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,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-02-21 16:33-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Spanish <cooker-i18n@linux-mandrake.com>\n"
@@ -17,1159 +17,1282 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instalando %s\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 "SsYy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versi�n %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Instalaci�n autom�tica de paquetes...\n"
-"Pidi� la instalaci�n del paquete %s\n"
+"Este software es libre y se puede redistribuir bajo los t�rminos de la "
+"licencia GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "�Est� todo bien?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "utilizaci�n: urpmf [opciones] <archivo>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Aceptar"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - no imprime nombre de etiqueta (por defecto si no hay "
+"etiq."
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Cancelar"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    en l�nea comando, incompat. con modo interactivo)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - imprime todas las etiquetas."
 
-#: ../_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 "SsYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - imprime nombre etiq.: nombre arch. rpm (se asume sin"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (S/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    etiq. en l�nea comando pero sin nombre paquete)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - imprime etiqueta de grupo: group."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - imprime etiqueta de tama�o: size."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - imprime etiqueta de serie: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - imprime etiqueta resumen: summary."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - imprime etiqueta de descripci�n: description."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - imprime etiq. provides: todo que proporciona (l�n. "
+"m�lt.)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - imprime etiq. requires: todo que precisa (l�n. m�lt.)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - imprime etiq. archivos: todos archivos (l�n. m�lt.)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - imprime etiq. conflicts: todos conflictos (l�n. m�lt.)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - imprime etiq. obsoletes: todo obsoleto (l�n. m�lt.)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - imprime etiq. prereqs: todos prereqs. (l�n. m�lt.)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "pruebe urpmf --help para m�s opciones"
 
-#: ../_irpm_.c:63
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "no se encontr� la lista completa de soportes"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: comando no encontrado\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "���programa para bajar de la red �%s� desconocido!!!\n"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocolo desconocido definido para %s"
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "no se encontr� webfetch (curl o wget, por ejemplo)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Aceptar"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "no se puede manejar el protocolo: %s"
+msgid "Is this OK?"
+msgstr "�Est� todo bien?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "fall� la copia: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Instalaci�n autom�tica de paquetes...\n"
+"Pidi� la instalaci�n del paquete %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "no se encuentra wget\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instalando %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget fall�: sali� con %d o se�al %d\n"
+msgid "unable to open rpmdb"
+msgstr "no se puede abrir rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "falta curl\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "no se puede acceder al archivo rpm [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "soporte �%s� intenta utilizar una lista ya usada, soporte ignorado"
+msgid "%s conflicts with %s"
+msgstr "%s est� en conflicto con %s"
 
-#: ../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 ""
-"no se puede utilizar el soporte �%s� como archivo de lista que ya utiliza "
-"otro soporte"
+msgid "%s is needed by %s"
+msgstr "%s es necesario para %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"no se puede utilizar el nombre �%s� para un soporte sin denominar porque ya "
-"se est� utilizando"
+msgid "unable to install package %s"
+msgstr "no se puede instalar el paquete %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"no se puede tener en cuenta el soporte �%s�, porque no existe archivo de "
-"lista [%s]"
+msgid "unable to remove package %s"
+msgstr "no se puede quitar el paquete %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "no se puede determinar el soporte de este archivo hdlist [%s]"
+msgid "Preparing..."
+msgstr "Preparando..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "no se puede acceder al archivo hdlist de �%s�, soporte ignorado"
+msgid "...retrieving failed: %s"
+msgstr "...fall� la recuperaci�n: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "no se puede acceder al archivo de la lista de �%s�, soporte ignorado"
+msgid "...retrieving done"
+msgstr "...recuperaci�n hecha"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "intentando pasar al soporte existente �%s�, evitando"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "obteniendo archivos rpm desde el soporte  �%s� ..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "no se puede encontrar el archivo hdlist para �%s�, soporte ignorado"
+msgid "malformed input: [%s]"
+msgstr "entrada mal formada [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "no se puede encontrar el archivo de lista para �%s�, soporte ignorado"
+msgid "unable to access medium \"%s\""
+msgstr "no se puede acceder al soporte �%s�"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "archivo de lista no coherente para �%s�, soporte ignorado"
+msgid "urpmi database locked"
+msgstr "base de datos de urpmi bloqueada"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "soporte no coherente �%s� marcado como borrable, pero no borrado"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "el soporte �%s� no est� seleccionado"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no se puede leer el archivo rpm [%s] del soporte �%s�"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
+msgstr "no se encontr� el paquete %s."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "el soporte �%s� no define ubicaci�n alguna para archivos rpm"
+
+#: ../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)"
 msgstr ""
-"no se puede inspeccionar el archivo de lista para �%s�, soporte ignorado"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "demasiados puntos de montaje para medios extra�bles �%s�"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "hay muchos paquetes con el mismo nombre de archivo rpm �%s�"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tomar dispositivo extra�ble como �%s�"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "no se puede analizar correctamente [%s] sobre el valor �%s�"
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "usar dispositivo extra�ble diferente [%s] para �%s�"
+msgid "The following packages contain %s: %s"
+msgstr "Los siguientes paquetes contienen %s: %s"
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no se puede recuperar el nombre de ruta para medio extra�ble �%s�"
+msgid "no package named %s"
+msgstr "ning�n paquete llamado %s"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "no se puede escribir el archivo de configuraci�n [%s]"
+msgid "error registering local packages"
+msgstr "error registrando paquetes locales"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "no se puede acceder al archivo rpm [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "escrito archivo de configuraci�n [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "obteniendo archivo rpm [%s] ..."
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "no se puede analizar \"%s\" en el archivo [%s]"
+msgid "invalid rpm file name [%s]"
+msgstr "nombre de archivo rpm no v�lido [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "examinando el manejador paralelo en el archivo [%s]"
+msgid "no entries relocated in depslist"
+msgstr "no hay entradas reubicadas en depslist"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "se encontr� manejador paralelo para los nodos: %s"
+msgid "relocated %s entries in depslist"
+msgstr "relocalizadas %s entradas en la lista de dependencias"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "usando el soporte asociado para el modo paralelo: %s"
+msgid "unmounting %s"
+msgstr "desmontando %s"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "no se puede utilizar la opci�n paralelo �%s�"
+msgid "mounting %s"
+msgstr "montando %s"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis no se puede usar con --media, --update o --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "quitando %d encabezados obsoletos del cache"
 
-#: ../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 "found %d headers in cache"
+msgstr "se encontraron %d encabezados en el cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "se gener� el archivo de s�ntesis hdlist para el soporte �%s�"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "examinando el archivo hdlist [%s]"
 
-#: ../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]"
 msgstr "examinando el archivo de s�ntesis [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problema leyendo el archivo hdlist del soporte �%s�"
+msgid "building hdlist [%s]"
+msgstr "generando hdlist [%s]"
 
-#: ../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 "reading headers from medium \"%s\""
+msgstr "leyendo encabezados del soporte �%s�"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "realizando una segunda pasada para computar las dependencias\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema leyendo el archivo de s�ntesis del soporte �%s�"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "no se puede abrir rpmdb"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "ya existe el soporte �%s�"
+msgid "nothing written in list file for \"%s\""
+msgstr "nada escrito en el archivo de lista para �%s�"
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "a�adido soporte %s"
+msgid "writing list file for medium \"%s\""
+msgstr "escribiendo archivo de lista para el soporte �%s�"
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "no se puede acceder al primer soporte de la instalaci�n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "no se puede escribir el archivo de lista de �%s�"
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "copiando archivo hdlists..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "archivo [%s] ya utilizado en el mismo soporte �%s�"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...copia hecha"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "no se puede interpretar el archivo hdlist de �%s�"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...copia hecha"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "no se encuentra el archivo hdlist para el soporte �%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)"
-msgstr ""
-"no se puede acceder al primer soporte de la instalaci�n (no se encontr� el "
-"archivo Mandrake/base/hdlists)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "fall� la recuperaci�n de hdlist fuente (o s�ntesis)"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "recuperando archivo hdlists..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "examinando el archivo MD5SUM"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...recuperaci�n hecha"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "copiando hdlist fuente (o s�ntesis) de �%s�..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...fall� la recuperaci�n: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "recuperando hdlist fuente (o s�ntesis) de �%s�..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descripci�n de hdlist no v�lida �%s� en archivo hdlists"
+msgid "retrieving description file of \"%s\"..."
+msgstr "recuperando descripci�n de archivo de �%s�..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "intentando seleccionar el soporte inexistente �%s�"
+msgid "no rpm files found from [%s]"
+msgstr "no se encontraron archivos rpm en [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "�%s�"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "no se pueden leer los archivos rpm de [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "seleccionando soportes m�ltiples: %s"
+msgid "reading rpm files from [%s]"
+msgstr "leyendo archivos rpm de [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "quitando el soporte �%s�"
+msgid "...copying done"
+msgstr "...copia hecha"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "base de datos de urpmi bloqueada"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...copia hecha"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no se puede acceder al soporte �%s�"
+msgid "copying source list of \"%s\"..."
+msgstr "copiando lista fuente de �%s�..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copiando descripci�n de archivo de �%s�..."
+msgid "copy of [%s] failed"
+msgstr "fall� la copia de [%s]"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copiando hdlist fuente (o s�ntesis) de �%s�..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "fall� la copia de [%s]"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "examinando el archivo MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "copiando descripci�n de archivo de �%s�..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "copiando lista fuente de �%s�..."
+msgid "removing medium \"%s\""
+msgstr "quitando el soporte �%s�"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "leyendo archivos rpm de [%s]"
+msgid "selecting multiple media: %s"
+msgstr "seleccionando soportes m�ltiples: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "no se pueden leer los archivos rpm de [%s]: %s"
+msgid "\"%s\""
+msgstr "�%s�"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "no se encontraron archivos rpm en [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "intentando seleccionar el soporte inexistente �%s�"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "recuperando descripci�n de archivo de �%s�..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"no se puede acceder al primer soporte de la instalaci�n (no se encontr� el "
+"archivo Mandrake/base/hdlists)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "recuperando hdlist fuente (o s�ntesis) de �%s�..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descripci�n de hdlist no v�lida �%s� en archivo hdlists"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "fall� la recuperaci�n de hdlist fuente (o s�ntesis)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving hdlists file..."
+msgstr "recuperando archivo hdlists..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "no se encuentra el archivo hdlist para el soporte �%s�"
+msgid "copying hdlists file..."
+msgstr "copiando archivo hdlists..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "archivo [%s] ya utilizado en el mismo soporte �%s�"
+msgid "unable to access first installation medium"
+msgstr "no se puede acceder al primer soporte de la instalaci�n"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "no se puede interpretar el archivo hdlist de �%s�"
+msgid "added medium %s"
+msgstr "a�adido soporte %s"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "no se puede escribir el archivo de lista de �%s�"
+msgid "medium \"%s\" already exists"
+msgstr "ya existe el soporte �%s�"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "escribiendo archivo de lista para el soporte �%s�"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problema leyendo el archivo hdlist del soporte �%s�"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nada escrito en el archivo de lista para �%s�"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis no se puede usar con --media, --update o --parallel"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "realizando una segunda pasada para computar las dependencias\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "no se puede utilizar la opci�n paralelo �%s�"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "leyendo encabezados del soporte �%s�"
+msgid "using associated media for parallel mode: %s"
+msgstr "usando el soporte asociado para el modo paralelo: %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "generando hdlist [%s]"
+msgid "found parallel handler for nodes: %s"
+msgstr "se encontr� manejador paralelo para los nodos: %s"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "se gener� el archivo de s�ntesis hdlist para el soporte �%s�"
+msgid "examining parallel handler in file [%s]"
+msgstr "examinando el manejador paralelo en el archivo [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "se encontraron %d encabezados en el cache"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "no se puede analizar \"%s\" en el archivo [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "quitando %d encabezados obsoletos del cache"
+msgid "write config file [%s]"
+msgstr "escrito archivo de configuraci�n [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "montando %s"
+msgid "unable to write config file [%s]"
+msgstr "no se puede escribir el archivo de configuraci�n [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "desmontando %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "no se puede recuperar el nombre de ruta para medio extra�ble �%s�"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "relocalizadas %s entradas en la lista de dependencias"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "usar dispositivo extra�ble diferente [%s] para �%s�"
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "no hay entradas reubicadas en depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "tomar dispositivo extra�ble como �%s�"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nombre de archivo rpm no v�lido [%s]"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "demasiados puntos de montaje para medios extra�bles �%s�"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "obteniendo archivo rpm [%s] ..."
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"no se puede inspeccionar el archivo de lista para �%s�, soporte ignorado"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "no se puede acceder al archivo rpm [%s]"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "archivo de lista no coherente para �%s�, soporte ignorado"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "no se puede acceder al archivo rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "no se puede encontrar el archivo de lista para �%s�, soporte ignorado"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "error registrando paquetes locales"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "no se puede encontrar el archivo hdlist para �%s�, soporte ignorado"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "ning�n paquete llamado %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "intentando pasar al soporte existente �%s�, evitando"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Los siguientes paquetes contienen %s: %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "no se puede acceder al archivo de la lista de �%s�, soporte ignorado"
 
-#: ../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\""
-msgstr "hay muchos paquetes con el mismo nombre de archivo rpm �%s�"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "no se puede acceder al archivo hdlist de �%s�, soporte ignorado"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "no se puede analizar correctamente [%s] sobre el valor �%s�"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "no se puede determinar el soporte de este archivo hdlist [%s]"
 
-#: ../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 "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
+"no se puede tener en cuenta el soporte �%s�, porque no existe archivo de "
+"lista [%s]"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "el soporte �%s� no define ubicaci�n alguna para archivos rpm"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"no se puede utilizar el nombre �%s� para un soporte sin denominar porque ya "
+"se est� utilizando"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "no se encontr� el paquete %s."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"no se puede utilizar el soporte �%s� como archivo de lista que ya utiliza "
+"otro soporte"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "el soporte �%s� no est� seleccionado"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "soporte �%s� intenta utilizar una lista ya usada, soporte ignorado"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no se puede leer el archivo rpm [%s] del soporte �%s�"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "soporte �%s� intenta utilizar un hdlist ya usado, soporte ignorado"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "soporte no coherente �%s� marcado como borrable, pero no borrado"
+msgid "syntax error in config file at line %s"
+msgstr "error de sintaxis en archivo de configuraci�n, en la l�nea %s"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "entrada mal formada [%s]"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completado, velocidad = %s"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "obteniendo archivos rpm desde el soporte  �%s� ..."
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Preparando..."
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% de %s completado, ETA = %s, velocidad = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "no se puede quitar el paquete %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync fall�: termin� con %d o se�al %d\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "no se puede instalar el paquete %s"
+msgid "ssh is missing\n"
+msgstr "falta ssh\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s es necesario para %s"
+msgid "rsync is missing\n"
+msgstr "falta rsync\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s est� en conflicto con %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 fall�, tal vez no se puede alcanzar alg�n nodo"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl fall�: sali� con %d o se�al %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 fall�, tal vez no se puede alcanzar alg�n nodo"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "falta curl\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "en el nodo %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget fall�: sali� con %d o se�al %d\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 "Fall� la instalaci�n en el nodo %s"
+msgid "wget is missing\n"
+msgstr "no se encuentra wget\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 "Es posible la instalaci�n"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "fall� la copia: %s"
 
-#: ../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 fall� en el host %s"
+msgid "unable to handle protocol: %s"
+msgstr "no se puede manejar el protocolo: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "el host %s no tiene un versi�n buena de urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "no se encontr� webfetch (curl o wget, por ejemplo)\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 ""
-"urmpe versi�n %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Esto es software libre y se debe redistribuir bajo los t�rminos de la "
-"licencia p�blica general GNU.\n"
-"\n"
-"uso:\n"
+msgid "unknown protocol defined for %s"
+msgstr "protocolo desconocido definido para %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         - imprime este mensaje de ayuda.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "���programa para bajar de la red �%s� desconocido!!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - seleccionar un paquete en las elecciones "
-"autom�ticamente.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Fall� la desinstalaci�n"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - verificar si se puede llevar a cabo la instalaci�n sin "
-"problemas.\n"
+"Para satisfacer las dependencias, se desinstalar�n los paquetes siguientes (%"
+"d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuido entre m�quinas de alias.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Verificando para quitar los paquetes siguientes"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - selecciona todas los paquetes que coincidan con la "
-"expresi�n.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nada que quitar"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: opci�n desconocida �-%s�, verifique el uso con --help\n"
+msgid "removing package %s will break your system"
+msgstr "quitar el paquete %s da�ar� su sistema"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "paquete desconocido "
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "paquetes desconocidos "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "quitar el paquete %s da�ar� su sistema"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: opci�n desconocida �-%s�, verifique el uso con --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Nada que quitar"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selecciona todas los paquetes que coincidan con la "
+"expresi�n.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Verificando para quitar los paquetes siguientes"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuido entre m�quinas de alias.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Para satisfacer las dependencias, se desinstalar�n los paquetes siguientes (%"
-"d MB)"
+"  --test         - verificar si se puede llevar a cabo la instalaci�n sin "
+"problemas.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Fall� la desinstalaci�n"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - seleccionar un paquete en las elecciones "
+"autom�ticamente.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - imprime este mensaje de ayuda.\n"
+
+#: ../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 ""
-"urmpf versi�n %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
+"urmpe versi�n %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Esto es software libre y se debe redistribuir bajo los t�rminos de la "
 "licencia p�blica general GNU.\n"
 "\n"
 "uso:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - usa s�lo soporte de actualizaci�n.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"callback es :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media         - usar s�lo soportes dados, separados por comas.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - par�ntesis derecho para cerrar grupo de expresiones.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"  --synthesis    - usar la s�ntesis provista en vez de la base de datos de "
-"urpmi.\n"
+"  (              - par�ntesis izquierdo para abrir grupo de expresiones.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modo informativo.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - NO unario, verdadero si la expresi�n es falsa.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - no imprime nombre de etiqueta (por defecto si no se "
-"proporciona\n"
-"etiqueta en la l�nea de comandos, incompatible con modo interactivo)\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - imprime todas las etiquetas.\n"
+"  -o             - operador O binario, verdadero si una expresi�n es "
+"verdadera.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - imprime nombre etiq.: nombre arch. rpm (se asume si no "
-"se proporciona\n"
-"etiqueta en la l�nea de comandos pero sin nombre de paquete)\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - imprime etiqueta de grupo: group.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - imprime etiqueta de tama�o: size.\n"
-
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - imprime etiqueta de �poca: epoch.\n"
-
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - imprime etiqueta resumen: summary.\n"
+"  -a             - operador binario Y, verdadero si ambas expresiones son "
+"verdaderas.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - imprime etiqueta de descripci�n: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - incluye c�digo Perl directamente como perl -e.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --provides      - imprime etiq. provides: todo que proporciona (l�neas "
-"m�lt.)\n"
+"  -f             - imprime versi�n, release y arquitectura con nombre.\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
-"  --requires      - imprime etiq. requires: todo que precisa (l�neas m�lt.)\n"
+"  -i             - ignora distinci�n entre may�s. y min�s. en todos los "
+"patrones.\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --files         - imprime etiq. archivos: todos archivos (l�neas m�lt.)\n"
+"  --obsoletes     - imprime etiq. obsoletes: todo lo obsoleto (l�neas "
+"m�lt.)\n"
 
-#: ../urpmf_.c:49
+#: ../urpmf:1
+#, c-format
 msgid ""
 "  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 "  --conflicts     - imprime etiq. conflicts: todos los conflictos (l�neas "
 "m�lt.)\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - imprime etiq. obsoletes: todo lo obsoleto (l�neas "
-"m�lt.)\n"
+"  --files         - imprime etiq. archivos: todos archivos (l�neas m�lt.)\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  -i             - ignora distinci�n entre may�s. y min�s. en todos los "
-"patrones.\n"
+"  --requires      - imprime etiq. requires: todo que precisa (l�neas m�lt.)\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  -f             - imprime versi�n, release y arquitectura con nombre.\n"
+"  --provides      - imprime etiq. provides: todo que proporciona (l�neas "
+"m�lt.)\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - incluye c�digo Perl directamente como perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - imprime etiqueta de descripci�n: description.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - imprime etiqueta resumen: summary.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - imprime etiqueta de �poca: epoch.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - imprime etiqueta de tama�o: size.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - imprime etiqueta de grupo: group.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - operador binario Y, verdadero si ambas expresiones son "
-"verdaderas.\n"
+"  --name          - imprime nombre etiq.: nombre arch. rpm (se asume si no "
+"se proporciona\n"
+"etiqueta en la l�nea de comandos pero sin nombre de paquete)\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - imprime todas las etiquetas.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - operador O binario, verdadero si una expresi�n es "
-"verdadera.\n"
+"  --quiet         - no imprime nombre de etiqueta (por defecto si no se "
+"proporciona\n"
+"etiqueta en la l�nea de comandos, incompatible con modo interactivo)\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - NO unario, verdadero si la expresi�n es falsa.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modo informativo.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  (              - par�ntesis izquierdo para abrir grupo de expresiones.\n"
+"  --synthesis    - usar la s�ntesis provista en vez de la base de datos de "
+"urpmi.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - par�ntesis derecho para cerrar grupo de expresiones.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media         - usar s�lo soportes dados, separados por comas.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"callback es :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - usa s�lo soporte de actualizaci�n.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"uso: urpmi.addmedia [opciones] <nombre> <url>\n"
-"donde <url> es uno de\n"
-"       file://<ruta>\n"
-"       ftp://<usuario>:<contrase�a>@<host>/<ruta> with <nombre de hdlist "
-"relativo>\n"
-"       ftp://<host>/<ruta> with <nombre de hdlist relativo>\n"
-"       http://<host>/<ruta> with <nombre de hdlist relativo>\n"
-"       removable://<ruta>\n"
+"urmpf versi�n %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Esto es software libre y se debe redistribuir bajo los t�rminos de la "
+"licencia p�blica general GNU.\n"
 "\n"
-"y [opciones] es uno o varios de\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         - usa wget para recuperar archivos remotos.\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         - usa curl para recuperar archivos remotos.\n"
+"uso:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limitar la velocidad de descarga.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "ya est� todo instalado"
 
-#: ../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        - usar proxy HTTP especificado, se asume que el puerto es\n"
-"                   1080 por defecto (formato <hostproxy[:puerto]>).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Es posible la instalaci�n"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - especificar usuario y contrase�a para utilizar en la\n"
-"                   autenticaci�n del proxy (formato <usuario:contrase�a>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Fall� la instalaci�n"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea s�lo soporte de actualizaci�n.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "�Intentar con m�s fuerza la instalaci�n (--force)? (s/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - crear autom�ticamente todos los soportes desde un\n"
-"                   soporte de instalaci�n.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "�Intentar de instalar sin verificar las dependencias? (s/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  - crear autom�ticamente un soporte para la parte XXX de\n"
-"                   una distribuci�n, XXX puede ser main, contrib, updates o\n"
-"                   cualquier otra cosa que haya sido configurada ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distribuyendo %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --from         - usar url especificada para la lista de r�plicas, la\n"
-"                   predeterminada es %s\n"
+"Fall� la instalaci�n, faltan algunos archivos:\n"
+"%s\n"
+"Puede querer actualizar su base de datos de urpmi"
 
-#: ../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"
-msgstr ""
-"  --version      - usar versi�n de distribuci�n especificada, por defecto,\n"
-"                   se toma la versi�n de la distribuci�n indicada por el\n"
-"                   paquete mandrake-release instalado.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - usar arquitectura especificada, lo predeterminado es la\n"
-"                   arquitectura del paquete mandrake-release instalado.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "�Desea continuar con la instalaci�n?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - limpia dir. encabezados de cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Los siguientes paquetes contienen firmas no v�lidas"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - intenta encontrar y usar archivo s�ntesis\n"
-"                   o hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Presione �Intro� cuando est� listo..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - fuerza generaci�n de archivos hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor, inserte el soporte denominado �%s� en el dispositivo [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "no se pueden a�adir actualizaciones de una distribuci�n cooker\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "no se pueden obtener los paquetes fuente, abortando"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"no es necesario dar <ruta relativa de hdlist> con --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "no se puede actualizar soporte �%s�\n"
+"Para resolver las dependencias, se instalar�n los paquetes siguientes (%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Necesita ser root para instalar las dependencias siguientes:\n"
 "%s\n"
-"falta <ruta relativa de hdlist>\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 ""
+"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
 "%s\n"
-"falta �with� para soporte por FTP\n"
+"�est� de acuerdo?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "no se puede crear soporte �%s�\n"
+msgid "unrequested"
+msgstr "no pedido"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"uso: urpmi.removemedia [-a] <nombre> ...\n"
-"donde <nombre> es nombre del soporte a borrar.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "debido a conflictos con %s"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selecciona todos los soportes.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "debido a que falta %s"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opciones desconocidas �%s�\n"
+msgid "due to unsatisfied %s"
+msgstr "debido a que no se satisfizo %s"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nada para quitar (use urpmi.addmedia para agregar un soporte)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "para instalar %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 ""
-"falta la entrada a quitar\n"
-"(una de %s)\n"
+"No se puede instalar alg�n paquete pedido:\n"
+"%s\n"
+"�est� de acuerdo?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"uso: urpmi.update [opciones] <nombre> ...\n"
-"donde <nombre> es nombre de soporte para actualizar.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Disculpe, elecci�n incorrecta, reint�ntelo\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - actualizar s�lo el soporte de actualizaci�n.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "�Qu� elige? (1-%d)"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - selecciona todos los soportes no extra�bles.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Uno de los paquetes siguientes es necesario:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - fuerza computaci�n total de arch. depslist.ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Uno de los paquetes siguientes es necesario para instalar %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "S�lo el superusuario est� autorizado a instalar paquetes"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"falta la entrada a actualizar\n"
-"(una de %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "uasando un entorno espec�fico en %s\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"
-msgstr ""
-"urmpi versi�n %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Esto es software libre y se debe redistribuir bajo los t�rminos de la "
-"licencia p�blica general GNU.\n"
-"\n"
-"uso:\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "No se puede crear el directorio [%s] para reporte de bugs"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"  --synthesis    - usar s�ntesis provista en lugar de base de datos de "
-"urpmi.\n"
+"Lo que se puede hacer con archivos rpm binarios utilizando --install-src"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - seleccionar autom�ticamente paquetes para actualizar "
-"sistema.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: opci�n desconocida �-%s�, verifique el uso con --help\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - forzar b�squeda difusa (lo mismo que -y).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "declaraci�n incorrecta del proxy en la l�nea de comandos\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - sig. paquete es paquete fuente (igual que -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  se instalan los nombres o archivos rpm dados en l�nea de comandos.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instalar s�lo paquete de fuentes (ning�n binario)\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modo informativo.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - quitar rpm del cache antes que nada.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modo silencioso.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - mantener rpm no usado en cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s          - sig. paquete es paquete fuente (igual que --src).\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - forzar b�squeda difusa (lo mismo que --fuzzy).\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -p             - no buscar en �provides� para encontrar paquete.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --force        - fuerza invocaci�n aunque no existan algunos paquetes.\n"
+"  -p             - permite buscar en provides para encontrar paquete.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --allow-nodeps - permitir preguntar al usuario para instalar paquetes\n"
-"                   sin verificar las dependencias.\n"
+"  -a             - selecciona todas coincidencias en l�nea de comando.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath   - ruta de exclusi�n separada por coma.\n"
+
+#: ../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  - permitir preguntar al usuario para instalar paquetes sin\n"
-"                   verificar las dependencias ni la integridad.\n"
+"  --verify-rpm   - verificar la firma del rpm antes de la instalaci�n.\n"
+"                   (--no-verify-rpm lo deshabilita, habilitado predet.).\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          - emitir un reporte de bug en el directorio indicado\n"
-"                   por el argumento siguiente.\n"
+"  --best-output  - selecciona el mejor interfaz seg�n el entorno:\n"
+"                   modo X o texto.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - usar la interfaz X.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1177,447 +1300,491 @@ msgstr ""
 "  --env          - usar entorno espec�fico (t�picamente para reportar\n"
 "                   bugs).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - usar la interfaz X.\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  - selecciona el mejor interfaz seg�n el entorno:\n"
-"                   modo X o texto.\n"
+"  --bug          - emitir un reporte de bug en el directorio indicado\n"
+"                   por el argumento siguiente.\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"
-msgstr ""
-"  --verify-rpm   - verificar la firma del rpm antes de la instalaci�n.\n"
-"                   (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath   - ruta de exclusi�n separada por coma.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  -a             - selecciona todas coincidencias en l�nea de comando.\n"
+"  --proxy-user   - especificar usuario y contrase�a para utilizar en la\n"
+"                   autenticaci�n del proxy (formato <usuario:contrase�a>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\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 ""
-"  -p             - permite buscar en provides para encontrar paquete.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -p             - no buscar en �provides� para encontrar paquete.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - forzar b�squeda difusa (lo mismo que --fuzzy).\n"
-
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s          - sig. paquete es paquete fuente (igual que --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modo silencioso.\n"
+"  --proxy        - usar proxy HTTP especificado, se asume que el puerto es\n"
+"                   1080 por defecto (formato <hostproxy[:puerto]>).\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modo informativo.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limitar la velocidad de descarga.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  se instalan los nombres o archivos rpm dados en l�nea de comandos.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - usa curl para recuperar archivos remotos.\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: opci�n desconocida �-%s�, verifique el uso con --help\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget para recuperar archivos remotos.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"Lo que se puede hacer con archivos rpm binarios utilizando --install-src"
+"  --allow-force  - permitir preguntar al usuario para instalar paquetes sin\n"
+"                   verificar las dependencias ni la integridad.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "No se puede crear el directorio [%s] para reporte de bugs"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - permitir preguntar al usuario para instalar paquetes\n"
+"                   sin verificar las dependencias.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "uasando un entorno espec�fico en %s\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - fuerza invocaci�n aunque no existan algunos paquetes.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "S�lo el superusuario est� autorizado a instalar paquetes"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - mantener rpm no usado en cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Uno de los paquetes siguientes es necesario para instalar %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - quitar rpm del cache antes que nada.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Uno de los paquetes siguientes es necesario:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instalar s�lo paquete de fuentes (ning�n binario)\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "�Qu� elige? (1-%d)"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - sig. paquete es paquete fuente (igual que -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Disculpe, elecci�n incorrecta, reint�ntelo\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - forzar b�squeda difusa (lo mismo que -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"No se puede instalar alg�n paquete pedido:\n"
-"%s\n"
-"�est� de acuerdo?"
+"  --auto-select  - seleccionar autom�ticamente paquetes para actualizar "
+"sistema.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - usar s�ntesis provista en lugar de base de datos de "
+"urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "debido a que no se satisfizo %s"
+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 ""
+"urmpi versi�n %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Esto es software libre y se debe redistribuir bajo los t�rminos de la "
+"licencia p�blica general GNU.\n"
+"\n"
+"uso:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "debido a que falta %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "no se puede actualizar soporte �%s�\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "debido a conflictos con %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "no pedido"
+msgid "unable to create medium \"%s\"\n"
+msgstr "no se puede crear soporte �%s�\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 ""
-"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
 "%s\n"
-"�est� de acuerdo?"
+"falta �with� para soporte por FTP\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Para resolver las dependencias, se instalar�n los paquetes siguientes (%d MB)"
+"%s\n"
+"falta <ruta relativa de hdlist>\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 ""
-"Necesita ser root para instalar las dependencias siguientes:\n"
 "%s\n"
+"no es necesario dar <ruta relativa de hdlist> con --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "no se pueden obtener los paquetes fuente, abortando"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "obteniendo archivo rpm [%s] ..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% de %s completado, ETA = %s, velocidad = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "no se pueden a�adir actualizaciones de una distribuci�n cooker\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completado, velocidad = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opciones desconocidas �%s�\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor, inserte el soporte denominado �%s� en el dispositivo [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Presione �Intro� cuando est� listo..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Los siguientes paquetes contienen firmas no v�lidas"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "�Desea continuar con la instalaci�n?"
-
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (s/N) "
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - fuerza generaci�n de archivos hdlist.\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"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
-"Fall� la instalaci�n, faltan algunos archivos:\n"
-"%s\n"
-"Puede querer actualizar su base de datos de urpmi"
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Fall� la instalaci�n"
+"  -h             - intenta encontrar y usar archivo s�ntesis\n"
+"                   o hdlist.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distribuyendo %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "�Intentar de instalar sin verificar las dependencias? (s/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "�Intentar con m�s fuerza la instalaci�n (--force)? (s/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "ya est� todo instalado"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - limpia dir. encabezados de cache.\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"
-"\n"
-"usage:\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"urmpq versi�n %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Esto es software libre y se debe redistribuir bajo los t�rminos de la "
-"licencia p�blica general GNU.\n"
-"\n"
-"uso:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - lista los paquetes disponibles.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - lista los soportes disponibles.\n"
+"  --arch         - usar arquitectura especificada, lo predeterminado es la\n"
+"                   arquitectura del paquete mandrake-release instalado.\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../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 ""
-"  --list-nodes   - lista los nodos disponibles cuando se usa --parallel.\n"
-
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - lista los alias paralelo disponibles.\n"
+"  --version      - usar versi�n de distribuci�n especificada, por defecto,\n"
+"                   se toma la versi�n de la distribuci�n indicada por el\n"
+"                   paquete mandrake-release instalado.\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  --headers      - extrae cabeceras para paquetes listados desde la\n"
-"                   bd de urpmi a stdout (s�lo root).\n"
+"  --from         - usar url especificada para la lista de r�plicas, la\n"
+"                   predeterminada es %s\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --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 ""
-"  --sources      - da todos los paquetes fuentes antes de bajar (s�lo "
-"root).\n"
-
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - extiende consulta a las dependencias del paquete.\n"
+"  --distrib-XXX  - crear autom�ticamente un soporte para la parte XXX de\n"
+"                   una distribuci�n, XXX puede ser main, contrib, updates o\n"
+"                   cualquier otra cosa que haya sido configurada ;-)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"  -u             - quitar paquete si ya est� instalada una versi�n m�s "
-"reciente.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - completar salida con paquete(s) a quitar.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - b�squeda inversa de lo que necesita el paquete.\n"
+"  --distrib      - crear autom�ticamente todos los soportes desde un\n"
+"                   soporte de instalaci�n.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - imprimir los grupos junto con los nombres.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - crea s�lo soporte de actualizaci�n.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - imprimir versi�n y revisi�n junto con el nombre.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
+msgstr ""
+"uso: urpmi.addmedia [opciones] <nombre> <url>\n"
+"donde <url> es uno de\n"
+"       file://<ruta>\n"
+"       ftp://<usuario>:<contrase�a>@<host>/<ruta> with <nombre de hdlist "
+"relativo>\n"
+"       ftp://<host>/<ruta> with <nombre de hdlist relativo>\n"
+"       http://<host>/<ruta> with <nombre de hdlist relativo>\n"
+"       removable://<ruta>\n"
+"\n"
+"y [opciones] es uno o varios de\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  los nombres o archivos rpm dados en l�nea de comandos se consultan.\n"
+"falta la entrada a quitar\n"
+"(una de %s)\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes s�lo se puede utilizar con --parallel"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nada para quitar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: placeholder.h:18
+#: ../urpmi.removemedia:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versi�n %s"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selecciona todos los soportes.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"uso: urpmi.removemedia [-a] <nombre> ...\n"
+"donde <nombre> es nombre del soporte a borrar.\n"
 
-#: placeholder.h:20
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Este software es libre y se puede redistribuir bajo los t�rminos de la "
-"licencia GNU GPL."
+"falta la entrada a actualizar\n"
+"(una de %s)\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "utilizaci�n: urpmf [opciones] <archivo>"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: placeholder.h:22
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  --quiet         - no imprime nombre de etiqueta (por defecto si no hay "
-"etiq."
+"  -d             - fuerza computaci�n total de arch. depslist.ordered.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    en l�nea comando, incompat. con modo interactivo)."
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - selecciona todos los soportes no extra�bles.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - imprime todas las etiquetas."
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - actualizar s�lo el soporte de actualizaci�n.\n"
 
-#: placeholder.h:25
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  --name          - imprime nombre etiq.: nombre arch. rpm (se asume sin"
+"uso: urpmi.update [opciones] <nombre> ...\n"
+"donde <nombre> es nombre de soporte para actualizar.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    etiq. en l�nea comando pero sin nombre paquete)."
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes s�lo se puede utilizar con --parallel"
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - imprime etiqueta de grupo: group."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no se puede leer el archivo rpm �%s�\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - imprime etiqueta de tama�o: size."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opci�n desconocida �-%s�, verifique el uso con --help\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - imprime etiqueta de serie: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+"  los nombres o archivos rpm dados en l�nea de comandos se consultan.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - imprime etiqueta resumen: summary."
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - imprimir versi�n y revisi�n junto con el nombre.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - imprime etiqueta de descripci�n: description."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - imprimir los grupos junto con los nombres.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr ""
-"  --provides      - imprime etiq. provides: todo que proporciona (l�n. "
-"m�lt.)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - b�squeda inversa de lo que necesita el paquete.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr ""
-"  --requires      - imprime etiq. requires: todo que precisa (l�n. m�lt.)."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - completar salida con paquete(s) a quitar.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --files         - imprime etiq. archivos: todos archivos (l�n. m�lt.)."
+"  -u             - quitar paquete si ya est� instalada una versi�n m�s "
+"reciente.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - extiende consulta a las dependencias del paquete.\n"
+
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - imprime etiq. conflicts: todos conflictos (l�n. m�lt.)."
+"  --sources      - da todos los paquetes fuentes antes de bajar (s�lo "
+"root).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletes     - imprime etiq. obsoletes: todo obsoleto (l�n. m�lt.)."
+"  --headers      - extrae cabeceras para paquetes listados desde la\n"
+"                   bd de urpmi a stdout (s�lo root).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - lista los alias paralelo disponibles.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --prereqs       - imprime etiq. prereqs: todos prereqs. (l�n. m�lt.)."
+"  --list-nodes   - lista los nodos disponibles cuando se usa --parallel.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "pruebe urpmf --help para m�s opciones"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - lista los soportes disponibles.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "no se encontr� la lista completa de soportes"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - lista los paquetes disponibles.\n"
+
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urmpq versi�n %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Esto es software libre y se debe redistribuir bajo los t�rminos de la "
+"licencia p�blica general GNU.\n"
+"\n"
+"uso:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl fall�: sali� con %d o se�al %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Fall� la instalaci�n en el nodo %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "falta rsync\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp fall�, tal vez no se puede alcanzar alg�n nodo"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync fall�: termin� con %d o se�al %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput fall�, tal vez no se puede alcanzar alg�n nodo"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "falta ssh\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "en el nodo %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "error de sintaxis en archivo de configuraci�n, en la l�nea %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp fall� en el host %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr "soporte �%s� intenta utilizar un hdlist ya usado, soporte ignorado"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "el host %s no tiene un versi�n buena de urpmi"
 
 #~ msgid "ignoring option \"%s\" not used"
 #~ msgstr "ignorando la opci�n \"%s\" no usada"
@@ -1646,12 +1813,6 @@ msgstr "no se encontr� la lista completa de soportes"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - muestra este mensaje de ayuda.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: opci�n desconocida �-%s�, verifique el uso con --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: no se puede leer el archivo rpm �%s�\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr "no se puede generar el archivo de s�ntesis para el soporte �%s�"
 
@@ -1736,9 +1897,6 @@ msgstr "no se encontr� la lista completa de soportes"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "declaraci�n incorrecta del proxy en la l�nea de comandos\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr ""
 #~ "uso: urpmi.addmedia [--update] <nombre> <url> [with <camino_relativo>]"
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"
diff --git a/po/eu.po b/po/eu.po
index 8adc710c..f3827947 100644
--- a/po/eu.po
+++ b/po/eu.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: 2002-09-09 19:28+0200\n"
 "Last-Translator: I�igo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -14,284 +14,500 @@ 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 instalatzen\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 "bBYy"
+
+#. 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"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf-ren %s bertsioa"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Paketeak automatikoki instalatzen...\n"
-"%s paketea instalatzea eskatu duzu\n"
+"Software librea da eta birbana daiteke GNU GPLren baldintzak betetzen badira."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Ados zaude?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "erabili: urpmf [aukerak] <fitxategia>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ados"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+" --quiet         - ez du etiketaren izena inprimatzen (lehenetsia da komando-"
+"lerroan etiketarik ez badago;"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Utzi"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    ez da modu interaktiboarekin bateragarria)."
 
-#: ../_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           - etiketa guztiak inprimatzen ditu."
 
-#: ../_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 "bBYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+" --name          - etiketaren izena inprimatzen du: rpm fitxategi-izena "
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr "(B/e) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    etiketarik ez badago, baina pakete-izenik gabe)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - etiketaren taldea inprimatzen du: taldea."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - etiketaren tamaina inprimatzen du: tamaina."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - etiketaren seriea inprimatzen du: seriea."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - etiketaren laburpena inprimatzen du: laburpena."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - etiketaren azalpena inprimatzen du: azalpena."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"    --provides      - etiketa-hornitzaileak inprimatzen ditu: hornitzaile "
+"guztiak (lerro anitz)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"    --requires      - etiketaren eskakizunak inprimatzen ditu: eskakizun "
+"guztiak (lerro anitz)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"    --files         - etiketa-fitxategiak inprimatzen ditu: fitxategi "
+"guztiak (lerro anitz)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - etiketa-gatazkak inprimatzen ditu: gatazka guztiak "
+"(lerro anitz)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - etiketa zaharkituak inprimatzen ditu: zaharkitu guztiak "
+"(lerro anitz)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"    --prereqs       - etiketaren aurre-eskakizunak inprimatzen ditu: aurre-"
+"eskakizun guztiak (lerro anitz)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "aukera gehiagotarako, saiatu urpmf --help"
 
-#: ../_irpm_.c:63
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "ez da euskarri-zerrenda osorik aurkitu"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: ez du komandoa aurkitu\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "webfetch `%s' ezezaguna!!!\n"
+msgid " (Y/n) "
+msgstr "(B/e) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s-rentzako protokolo ezezaguna definitu da"
+msgid "Cancel"
+msgstr "Utzi"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "ez da webfetch (une honetan curl edo wget) aurkitu\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ados"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ezin da maneiatu protokoloa: %s"
+msgid "Is this OK?"
+msgstr "Ados zaude?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Paketeak automatikoki instalatzen...\n"
+"%s paketea instalatzea eskatu duzu\n"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "%s instalatzen\n"
 
-#: ../urpm.pm_.c:246
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...huts egin du kopiatzean"
+msgid "unable to open rpmdb"
+msgstr "ezin da rpm fitxategia erregistratu"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget ez dago\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "ezin da [%s] rpm fitxategia atzitu"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget-ek huts egin du: %d(r)ekin edo %d seinalearekin irten da\n"
+msgid "%s conflicts with %s"
+msgstr "%s-k %s-rekin gatazka sortzen du"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl ez dago\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr "%s behar du %s-k"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"\"%s\" euskarriak erabilitako zerrenda bat erabili nahi du; jaramonik ez "
-"euskarriari"
+msgid "unable to install package %s"
+msgstr "ezin da %s paketea instalatu"
 
-#: ../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 ""
-"ezin da \"%s\" euskarriaren ardura hartu, zerrendaren fitxategia beste "
-"euskarri bat ari delako erabiltzen"
+msgid "unable to remove package %s"
+msgstr "ezin da %s paketea ezabatu"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"ezin da izen gabeko euskarrirako \"%s\" izena erabili, dagoeneko erabilita "
-"dagoelako"
+msgid "Preparing..."
+msgstr "Prestatzen..."
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"ezin da \"%s\" euskarria aintzat hartu [%s] zerrenda-fitxategia existitzen "
-"ez delako"
+msgid "...retrieving failed: %s"
+msgstr "...huts egin du berreskuratzean: %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ezin da goiburuko-zerrendaren fitxategi honen [%s] euskarria zehaztu"
+msgid "...retrieving done"
+msgstr "...berreskuratzea amaitu da"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "rpm fitxategiak eskuratzen..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
-"ezin da \"%s\"(r)en goiburuko-zerrendaren fitxategia atzitu; jaramonik ez "
-"euskarriari"
+msgid "malformed input: [%s]"
+msgstr "gaizki eratutako sarrera: [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"ezin da \"%s\"(r)en zerrenda-fitxategia atzitu; jaramonik ez euskarriari"
+msgid "unable to access medium \"%s\""
+msgstr "ezin da \"%s\" euskarria atzitu"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "lehendik dagoen \"%s\" euskarria saltatzen saiatzen, ekiditen"
+msgid "urpmi database locked"
+msgstr "urpmi datu-basea blokeatuta"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-"ezin da \"%s\"(r)en goiburuko-zerrendaren fitxategia aurkitu; jaramonik ez "
-"euskarriari"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "\"%s\" euskarri inkoherentea aldagarri gisa markatuta, baina ez da"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-"ezin da \"%s\"(r)en zerrenda-fitxategia aurkitu; jaramonik ez euskarriari"
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" euskarria ez dago hautatuta"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ezin da [%s] rpm fitxategia \"%s\" euskarrian irakurri"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
+msgstr "ez da %s paketea aurkitu."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
-"\"%s\"(r)en zerrenda-fitxategia inkoherentea da; jaramonik ez euskarriari"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid ""
+"medium \"%s\" use an invalid list file (mirror is problably not up-to-date, "
+"trying to use alternate method)"
 msgstr ""
-"ezin da \"%s\"(r)en zerrenda-fitxategia ikuskatu; jaramonik ez euskarriari"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "muntatze-puntu gehiegi \"%s\" euskarri aldagarriarentzat"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "pakete bat baino gehiago dago \"%s\" rpm fitxategi-izen berarekin"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "gailu aldagarria \"%s\" gisa hartu da"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ezin da [%s] \"%s\" balioan ondo analizatu (parse)"
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "\"%2$s\"(r)entzat gailu aldagarriak [%1$s] erabiltzen"
+msgid "The following packages contain %s: %s"
+msgstr "Ondoko paketeek %s dute: %s"
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ezin da \"%s\" euskarri aldagarriaren bide-izena berreskuratu"
+msgid "no package named %s"
+msgstr "ez dago %s izeneko paketerik"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "huts egin du konfigurazio-fitxategian [%s] idaztean"
+msgid "error registering local packages"
+msgstr "errorea pakete lokalak erregistratzean"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "ezin da [%s] rpm fitxategia atzitu"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "rpm fitxategiak eskuratzen..."
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "[%s] konfigurazio-fitxategian idatzi"
+msgid "invalid rpm file name [%s]"
+msgstr "rpm fitxategi-izena [%s] baliogabea"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "ezin da \"%s\" aztertu [%s] fitxategian"
+msgid "no entries relocated in depslist"
+msgstr "depslist-en ez da sarrerarik birkotatu"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "agintari paraleloa aztertzen [%s] fitxategian"
+msgid "relocated %s entries in depslist"
+msgstr "%s sarrera depslist-en birkokatuta"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "nodoentzako agintari paraleloa aurkitu da: %s"
+msgid "unmounting %s"
+msgstr "%s desmuntatzen"
 
-#: ../urpm.pm_.c:780
-#, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "modu paraleloarentzako elkartutako euskarria erabiltzen : %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "%s muntatzen"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ezin da \"%s\" aukera paraleloa erabili"
+msgid "removing %d obsolete headers in cache"
+msgstr "%d goiburuko zaharkituak cache-tik ezabatzen"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis ezin da hauekin erabili --media, --update edo --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "%d goiburuko aurkitu dira cache-an"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "eraiki \"%s\" euskarrirako goiburuko-zerrendaren laburpen-fitxategia"
 
-#: ../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]"
 msgstr "[%s] goiburuko-zerrendaren fitxategia aztertzean"
 
-#: ../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]"
 msgstr "[%s] laburpen-fitxategia aztertzen"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "\"%s\" euskarriaren hdlist fitxategia irakurtzeko arazoa"
+msgid "building hdlist [%s]"
+msgstr "[%s] goiburuko-zerrenda eraikitzen"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "\"%s\" euskarritik goiburuak irakurtzen"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "Bigarren pasada burutzen menpekotasunak konputatzeko\n"
 
-#: ../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\""
 msgstr "\"%s\" euskarriaren sintesi fitxategia irakurtzeko arazoa"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "ezin da rpm fitxategia erregistratu"
+#: ../urpm.pm:1
+#, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr "ez dago ezer idatzita \"%s\"(r)en zerrenda-fitxategian"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "ez da \"%s\" euskarrirako goiburuko-zerrendaren fitxategirik aurkitu"
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" euskarria badago lehendik ere"
+msgid "unable to write list file of \"%s\""
+msgstr "ezin da \"%s\"(r)en zerrenda-fitxategian idatzi"
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "gehitu den %s euskarria "
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "[%s] fitxategia dagoeneko erabileran \"%s\" euskarri berdinean"
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "ezin da lehen instalazio-euskarria atzitu"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ezin da \"%s\" (r)en goiburuko-zerrendaren fitxategia analizatu"
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "goiburuko-zerrendaren fitxategia kopiatzen..."
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ez da \"%s\" euskarrirako goiburuko-zerrendaren fitxategirik aurkitu"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr ""
+"huts egin du iturburuko goiburuko-zerrenda (edo laburpena) berreskuratzean "
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "[%s] goiburuko-zerrendaren fitxategia aztertzean"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "\"%s\"(r)en iturburuko goiburuko-zerrenda (edo laburpena) kopiatzen..."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
+"\"%s\"(r)en iturburuko goiburuko-zerrenda (edo laburpena) berreskuratzen..."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving description file of \"%s\"..."
+msgstr "\"%s\"(r)en deskribapen-fitxategia berreskuratzen..."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no rpm files found from [%s]"
+msgstr "[%s](e)n ez da rpm fitxategirik aurkitu"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ezin dira rpm fitxategiak [%s]-tik irakurri: %s"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
+#: ../urpm.pm:1
+#, c-format
+msgid "reading rpm files from [%s]"
+msgstr "[%s]-tik fitxategiak irakurtzen"
+
+#: ../urpm.pm:1
+#, c-format
 msgid "...copying done"
 msgstr "...kopiatzea amaitu da"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
+#: ../urpm.pm:1
+#, fuzzy, c-format
 msgid "...copying failed"
 msgstr "...kopiatzea amaitu da"
 
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
+#: ../urpm.pm:1
+#, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "\"%s\"(r)en iturburu-zerrenda kopiatzen..."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "huts egin da [%s] kopiatzean"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\"(r)en iturburuko goiburuko-zerrenda (edo laburpena) kopiatzen..."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\"(r)en deskribapen-fitxategia kopiatzen..."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "\"%s\" euskarria kentzen"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "selecting multiple media: %s"
+msgstr "euskarri anitz hautatzen: %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "existitzen ez den \"%s\" euskarria hautatzen saiatzen"
+
+#: ../urpm.pm:1
+#, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
@@ -299,337 +515,339 @@ msgstr ""
 "ezin da lehen instalazio-euskarria atzitu (ez da Mandrake/base/hdlists "
 "fitxategia aurkitu)"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "goiburuko-zerrendaren fitxategia berreskuratzen..."
-
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...berreskuratzea amaitu da"
-
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...huts egin du berreskuratzean: %s"
-
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 "goiburuko-zerrendaren azalpen baliogabea \"%s\" goiburuko-zerrendaren "
 "fitxategian "
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "existitzen ez den \"%s\" euskarria hautatzen saiatzen"
+msgid "retrieving hdlists file..."
+msgstr "goiburuko-zerrendaren fitxategia berreskuratzen..."
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "copying hdlists file..."
+msgstr "goiburuko-zerrendaren fitxategia kopiatzen..."
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "euskarri anitz hautatzen: %s"
+msgid "unable to access first installation medium"
+msgstr "ezin da lehen instalazio-euskarria atzitu"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "\"%s\" euskarria kentzen"
-
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi datu-basea blokeatuta"
+msgid "added medium %s"
+msgstr "gehitu den %s euskarria "
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ezin da \"%s\" euskarria atzitu"
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" euskarria badago lehendik ere"
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\"(r)en deskribapen-fitxategia kopiatzen..."
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "\"%s\" euskarriaren hdlist fitxategia irakurtzeko arazoa"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\"(r)en iturburuko goiburuko-zerrenda (edo laburpena) kopiatzen..."
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis ezin da hauekin erabili --media, --update edo --parallel"
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "huts egin da [%s] kopiatzean"
+msgid "unable to use parallel option \"%s\""
+msgstr "ezin da \"%s\" aukera paraleloa erabili"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "[%s] goiburuko-zerrendaren fitxategia aztertzean"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "modu paraleloarentzako elkartutako euskarria erabiltzen : %s"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "\"%s\"(r)en iturburu-zerrenda kopiatzen..."
+msgid "found parallel handler for nodes: %s"
+msgstr "nodoentzako agintari paraleloa aurkitu da: %s"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "[%s]-tik fitxategiak irakurtzen"
+msgid "examining parallel handler in file [%s]"
+msgstr "agintari paraleloa aztertzen [%s] fitxategian"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ezin dira rpm fitxategiak [%s]-tik irakurri: %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ezin da \"%s\" aztertu [%s] fitxategian"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s](e)n ez da rpm fitxategirik aurkitu"
+msgid "write config file [%s]"
+msgstr "[%s] konfigurazio-fitxategian idatzi"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "\"%s\"(r)en deskribapen-fitxategia berreskuratzen..."
+msgid "unable to write config file [%s]"
+msgstr "huts egin du konfigurazio-fitxategian [%s] idaztean"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr ""
-"\"%s\"(r)en iturburuko goiburuko-zerrenda (edo laburpena) berreskuratzen..."
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-"huts egin du iturburuko goiburuko-zerrenda (edo laburpena) berreskuratzean "
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ezin da \"%s\" euskarri aldagarriaren bide-izena berreskuratu"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ez da \"%s\" euskarrirako goiburuko-zerrendaren fitxategirik aurkitu"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "\"%2$s\"(r)entzat gailu aldagarriak [%1$s] erabiltzen"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "[%s] fitxategia dagoeneko erabileran \"%s\" euskarri berdinean"
+msgid "taking removable device as \"%s\""
+msgstr "gailu aldagarria \"%s\" gisa hartu da"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ezin da \"%s\" (r)en goiburuko-zerrendaren fitxategia analizatu"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "muntatze-puntu gehiegi \"%s\" euskarri aldagarriarentzat"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ezin da \"%s\"(r)en zerrenda-fitxategian idatzi"
-
-#: ../urpm.pm_.c:1526
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "ez da \"%s\" euskarrirako goiburuko-zerrendaren fitxategirik aurkitu"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"ezin da \"%s\"(r)en zerrenda-fitxategia ikuskatu; jaramonik ez euskarriari"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ez dago ezer idatzita \"%s\"(r)en zerrenda-fitxategian"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+"\"%s\"(r)en zerrenda-fitxategia inkoherentea da; jaramonik ez euskarriari"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "Bigarren pasada burutzen menpekotasunak konputatzeko\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+"ezin da \"%s\"(r)en zerrenda-fitxategia aurkitu; jaramonik ez euskarriari"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "\"%s\" euskarritik goiburuak irakurtzen"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+"ezin da \"%s\"(r)en goiburuko-zerrendaren fitxategia aurkitu; jaramonik ez "
+"euskarriari"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "[%s] goiburuko-zerrenda eraikitzen"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "lehendik dagoen \"%s\" euskarria saltatzen saiatzen, ekiditen"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "eraiki \"%s\" euskarrirako goiburuko-zerrendaren laburpen-fitxategia"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+"ezin da \"%s\"(r)en zerrenda-fitxategia atzitu; jaramonik ez euskarriari"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d goiburuko aurkitu dira cache-an"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
+"ezin da \"%s\"(r)en goiburuko-zerrendaren fitxategia atzitu; jaramonik ez "
+"euskarriari"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "%d goiburuko zaharkituak cache-tik ezabatzen"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ezin da goiburuko-zerrendaren fitxategi honen [%s] euskarria zehaztu"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "%s muntatzen"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"ezin da \"%s\" euskarria aintzat hartu [%s] zerrenda-fitxategia existitzen "
+"ez delako"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "%s desmuntatzen"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"ezin da izen gabeko euskarrirako \"%s\" izena erabili, dagoeneko erabilita "
+"dagoelako"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s sarrera depslist-en birkokatuta"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"ezin da \"%s\" euskarriaren ardura hartu, zerrendaren fitxategia beste "
+"euskarri bat ari delako erabiltzen"
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "depslist-en ez da sarrerarik birkotatu"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"\"%s\" euskarriak erabilitako zerrenda bat erabili nahi du; jaramonik ez "
+"euskarriari"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "rpm fitxategi-izena [%s] baliogabea"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"\"%s\" euskarriak, erabileran dagoen hdlist bat erabili nahi du; jaramonik "
+"ez euskarriari"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "rpm fitxategiak eskuratzen..."
+#: ../urpm.pm:1
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "sintaxi-errorea konfigurazio-fitxategiaren %s lerroan"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ezin da [%s] rpm fitxategia atzitu"
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ezin da [%s] rpm fitxategia atzitu"
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "errorea pakete lokalak erregistratzean"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync-ek hutsegin du: %d(r)ekin edo %d seinalearekin amaitu da\n"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "ez dago %s izeneko paketerik"
+msgid "ssh is missing\n"
+msgstr "ssh falta da\n"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Ondoko paketeek %s dute: %s"
+msgid "rsync is missing\n"
+msgstr "rsync falta da\n"
 
-#: ../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\""
-msgstr "pakete bat baino gehiago dago \"%s\" rpm fitxategi-izen berarekin"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl-ek huts egin du: %d(r)ekin edo %d seinalearekin irten du\n"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ezin da [%s] \"%s\" balioan ondo analizatu (parse)"
+msgid "curl is missing\n"
+msgstr "curl ez dago\n"
 
-#: ../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)"
-msgstr ""
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget-ek huts egin du: %d(r)ekin edo %d seinalearekin irten da\n"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+msgid "wget is missing\n"
+msgstr "wget ez dago\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "...huts egin du kopiatzean"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "ez da %s paketea aurkitu."
+msgid "unable to handle protocol: %s"
+msgstr "ezin da maneiatu protokoloa: %s"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" euskarria ez dago hautatuta"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "ez da webfetch (une honetan curl edo wget) aurkitu\n"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ezin da [%s] rpm fitxategia \"%s\" euskarrian irakurri"
+msgid "unknown protocol defined for %s"
+msgstr "%s-rentzako protokolo ezezaguna definitu da"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "\"%s\" euskarri inkoherentea aldagarri gisa markatuta, baina ez da"
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "webfetch `%s' ezezaguna!!!\n"
+
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "...huts egin du kopiatzean"
 
-#: ../urpm.pm_.c:2337
+#: ../urpme:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "gaizki eratutako sarrera: [%s]"
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak kendu egingo "
+"dira(%d MB)"
 
-#: ../urpm.pm_.c:2344
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "rpm fitxategiak eskuratzen..."
+msgid "Checking to remove the following packages"
+msgstr "Ondoko paketeetako bat behar da:"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Prestatzen..."
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Ez dago ezer kentzeko.\n"
 
-#: ../urpm.pm_.c:2448
-#, c-format
-msgid "unable to remove package %s"
-msgstr "ezin da %s paketea ezabatu"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "removing package %s will break your system"
+msgstr "%s paketea kentzen baduzu, sistemak porrot egingo du\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpme:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "ezin da %s paketea instalatu"
+msgid "unknown package"
+msgstr "pakete ezezaguna "
 
-#: ../urpm.pm_.c:2466
+#: ../urpme:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s behar du %s-k"
+msgid "unknown packages"
+msgstr "pakete ezezagunak "
 
-#: ../urpm.pm_.c:2467
+#: ../urpme:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s-k %s-rekin gatazka sortzen du"
-
-#: ../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"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
+"urpme: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabilita\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"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
+"  -a             - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi banatua aliasa duten makinen artean.\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalazioak %s nodoan huts egin du"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-msgid "Installation is possible"
-msgstr "Instalazioak egin daiteke"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - instalazioa arazorik gabe burutu daitekeen egiaztatzen "
+"du.\n"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
-#, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Instalazioak %s nodoan huts egin du"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - aukeren arteako pakete bat hautatu automatikoki.\n"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
+#: ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "%s ostalariak ez dauka urpmi bertsio zuzena"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - laguntza-mezu hau inprimatzen du.\n"
 
-#: ../urpme_.c:39
+#: ../urpme:1
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -646,569 +864,449 @@ msgstr ""
 "\n"
 "erabili:\n"
 
-#: ../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         - laguntza-mezu hau inprimatzen du.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - aukeren arteako pakete bat hautatu automatikoki.\n"
-
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"  --test         - instalazioa arazorik gabe burutu daitekeen egiaztatzen "
-"du.\n"
-
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi banatua aliasa duten makinen artean.\n"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  -a             - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
 
-#: ../urpme_.c:64
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"urpme: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabilita\n"
-
-#: ../urpme_.c:83
-msgid "unknown package"
-msgstr "pakete ezezaguna "
-
-#: ../urpme_.c:83
-msgid "unknown packages"
-msgstr "pakete ezezagunak "
+"  -a             - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
 
-#: ../urpme_.c:93
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "%s paketea kentzen baduzu, sistemak porrot egingo du\n"
-
-#: ../urpme_.c:95
-#, fuzzy
-msgid "Nothing to remove"
-msgstr "Ez dago ezer kentzeko.\n"
-
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Ondoko paketeetako bat behar da:"
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
+"  -u             - paketea kentzen du bertsio hobea instalatuta badago.\n"
 
-#: ../urpme_.c:105
+#: ../urpmf:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak kendu egingo "
-"dira(%d MB)"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "...huts egin du kopiatzean"
-
-#: ../urpmf_.c:26
+#: ../urpmf:1
 #, fuzzy, c-format
 msgid ""
-"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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"urpmq-ren %s bertsioa\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Software librea da eta birbana daiteke GNU GPLen ezarritako baldintzak betez "
-"gero.\n"
-"\n"
-"erabili:\n"
+"  -u             - paketea kentzen du bertsio hobea instalatuta badago.\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - euskarri eguneratua bakarrik erabiltzen du.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - goiburukoen cache-direktorioa garbitzen du.\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --media       - komaz bereizitako euskarriak bakarrik erabiltzen ditu.\n"
+"  -f             - bertsioa, argitalpena eta fitxategia ere izenarekin "
+"inprimatzen ditu.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
-" - synthesis   - erabili adierazitako sintesia urpmi db erabili beharren.\n"
-
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - modu xehetua.\n"
+"  -f             - goiburuko-zerrendaren fitxategiak sortzera behartzen du.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-" --quiet         - ez du etiketaren izena inprimatzen (lehenetsia da komando-"
-"lerroan etiketarik ez badago;"
-
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - etiketa guztiak inprimatzen ditu."
+"  --obsoletes     - etiketa zaharkituak inprimatzen ditu: zaharkitu guztiak "
+"(lerro anitz)."
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-" --name          - etiketaren izena inprimatzen du: rpm fitxategi-izena "
-
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - etiketaren taldea inprimatzen du: taldea."
-
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - etiketaren tamaina inprimatzen du: tamaina."
-
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - etiketaren tamaina inprimatzen du: tamaina."
-
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - etiketaren laburpena inprimatzen du: laburpena."
-
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - etiketaren azalpena inprimatzen du: azalpena."
+"  --conflicts     - etiketa-gatazkak inprimatzen ditu: gatazka guztiak "
+"(lerro anitz)."
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
-"    --provides      - etiketa-hornitzaileak inprimatzen ditu: hornitzaile "
+"    --files         - etiketa-fitxategiak inprimatzen ditu: fitxategi "
 "guztiak (lerro anitz)."
 
-#: ../urpmf_.c:47
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 "    --requires      - etiketaren eskakizunak inprimatzen ditu: eskakizun "
 "guztiak (lerro anitz)."
 
-#: ../urpmf_.c:48
-#, fuzzy
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"    --files         - etiketa-fitxategiak inprimatzen ditu: fitxategi "
+"    --provides      - etiketa-hornitzaileak inprimatzen ditu: hornitzaile "
 "guztiak (lerro anitz)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr ""
-"  --conflicts     - etiketa-gatazkak inprimatzen ditu: gatazka guztiak "
-"(lerro anitz)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - etiketaren azalpena inprimatzen du: azalpena."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - etiketa zaharkituak inprimatzen ditu: zaharkitu guztiak "
-"(lerro anitz)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - etiketaren laburpena inprimatzen du: laburpena."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -f             - goiburuko-zerrendaren fitxategiak sortzera behartzen du.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - etiketaren tamaina inprimatzen du: tamaina."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - bertsioa, argitalpena eta fitxategia ere izenarekin "
-"inprimatzen ditu.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - etiketaren tamaina inprimatzen du: tamaina."
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - goiburukoen cache-direktorioa garbitzen du.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - etiketaren taldea inprimatzen du: taldea."
 
-#: ../urpmf_.c:54
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -u             - paketea kentzen du bertsio hobea instalatuta badago.\n"
+" --name          - etiketaren izena inprimatzen du: rpm fitxategi-izena "
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - etiketa guztiak inprimatzen ditu."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+" --quiet         - ez du etiketaren izena inprimatzen (lehenetsia da komando-"
+"lerroan etiketarik ez badago;"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  -u             - paketea kentzen du bertsio hobea instalatuta badago.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - modu xehetua.\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  -a             - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
+" - synthesis   - erabili adierazitako sintesia urpmi db erabili beharren.\n"
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  -a             - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
+"  --media       - komaz bereizitako euskarriak bakarrik erabiltzen ditu.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - euskarri eguneratua bakarrik erabiltzen du.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"erabili: urpmi.addmedia [aukerak] <izena> <url> [with <bide-izen "
-"erlatiboa>]\n"
-"non <url> hauetako bat den:\n"
-"       file://<bide-izena>\n"
-"       ftp://<erabiltzaile-izena>:<pasahitza>@<ostalaria>/<bide-izena> with "
-"<hdlist-en fitxategi-izen erlatiboa>\n"
-"       ftp://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
-"erlatiboa>\n"
-"       http://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
-"erlatiboa>\n"
-"       removable://<bide-izena>\n"
+"urpmq-ren %s bertsioa\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Software librea da eta birbana daiteke GNU GPLen ezarritako baldintzak betez "
+"gero.\n"
 "\n"
-"eta [aukerak] hemengoak dira:\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 erabiltzen du urruneko fitxategiak berreskuratzeko.\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 erabiltzen du urruneko fitxategiak berreskuratzeko.\n"
+"erabili:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "dena dago instalatuta"
 
-#: ../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        - erabili adierazitako HTTP proxya, jatorrian 1080 portua\n"
-"                   erabiltzen da (formatua <proxyostalaria[:portua]> da).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalazioak egin daiteke"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - proxyarekin autentifikatzeko erabili beharreko "
-"erabiltzaile\n"
-"                    eta pasahitza zehaztu (formatua <erabiltzailea:"
-"pasahitza> da).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalazioak huts egin du"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - euskarri eguneratua sortzen du.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Areago instalatzen saiatu (--force)? (b/E) "
 
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - euskarri guztiak automatikoki instalazio-euskarritik "
-"sortzen ditu.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Mendekotasunak egiaztatu gabe instalatzen saiatu nahi duzu? (B/e) "
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "%s banatzen\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --env          - erabili ingurune zehatza (normalean akats\n"
-"                   txostena).\n"
+"Huts egin du instalatzean, fitxategi batzuk falta dira.\n"
+"Zure urpmi datu-basea eguneratzea nahiko duzu "
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr "(b/E) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Instalazioarekin aurrera egin nahi duzu ?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - goiburukoen cache-direktorioa garbitzen du.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Ondorengo paketeek sinadura okerrak dituzte"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - laburpen-fitxategiak edo goiburuko-zerrendaren "
-"fitxategiak bilatzen edo erabiltzen saiatzen da.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Prest zaudenean sakatu Sartu..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-"  -f             - goiburuko-zerrendaren fitxategiak sortzera behartzen du.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "\"%s\" izeneko euskarria [%s] gailuan sartu"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"ez dago <goiburuko-zerrendaren bide-izen erlatiboa> --distrib erabiliz eman "
-"beharrik"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ezin da \"%s\" euskarria eguneratu\n"
+"Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak instalatuko dira"
+"(%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"root izan behar duzu ondorengo menpekotasunak instalatzeko:\n"
 "%s\n"
-"<goiburuko-zerrendaren bide-izen erlatiboa> falta da\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 ""
+"Ondoko paketeak kendu behar dira beste batzuk eguneratuak izan daitezen:\n"
 "%s\n"
-"ftp euskarriaren `(r)ekin' falta da\n"
+"ados zaude?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ezin da \"%s\" euskarria sortu\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "unrequested"
 msgstr ""
-"erabili: urpmi.removemedia [-a] <izena> ...\n"
-"non <izena> kendu beharreko euskarri-izena den.\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - euskarri guztiak hautatzen ditu.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "%s-k %s-rekin gatazka sortzen du"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "wget ez dago\n"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"\n"
-"aukera ezezagunak '%s'\n"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ez dago kentzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "ezin da %s paketea instalatu"
 
-#: ../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 ""
-"kendu beharreko sarrera falta da\n"
-"(%s(e)tako bat)\n"
+"Eskatutako pakete batzuk ezin dira instalatu:\n"
+"%s\n"
+"ados zaude?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"erabili: urpmi.update [aukerak] <izena> ...\n"
-"non <izena> eguneratzeko euskarri-izena den.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Lastima, aukera okerra, saiatu berriro\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - euskarri eguneratua bakarrik erabiltzen du.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Zein aukeratu duzu? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - euskarri ez-aldagarri guztiak hautatzen ditu.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Ondoko paketeetako bat behar da:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - depslist.ordered fitxategiaren kontaketa osoa bultzatzen "
-"du.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "%s instalatzeko, ondoko paketeetako bat behar da:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Supererabiltzaileak bakarrik du pakete lokalak instalatzeko baimena"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"eguneratu beharreko sarrera falta da\n"
-"(%s(e)tako bat)\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"
-msgstr ""
-"urpmi-ren %s bertsioa\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Software librea da eta birbana daiteke GNU GPL-en ezarritako baldintzak "
-"betez.\n"
-"\n"
-"erabili:\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "ezin da akatsen txostenak uzteko [%s] direktorioa sortu"
 
-#: ../urpmi_.c:75
-#, fuzzy
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-" - synthesis   - erabili adierazitako sintesia urpmi db erabili beharren.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"  --auto-select  - automatikoki sistema bertsio-berritzeko paketeak "
-"hautatzen ditu.\n"
+"urpmi: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabilita\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr ""
-"  --fuzzy        - hurbilketazko bilaketa behartzen du (-y bezalakoa da).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "proxy deklarazio okerra komando-lerroan\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  komando-lerroko izenak edo rpm-fitxategiak instalatuta daude.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modu xehetua.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - quiet modua.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --src          - hurrengo paketea iturburu-pakete bat da (-s bezalakoa).\n"
+"  -s             - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
+"  -y             - hurbilketazko bilaketa behartzen du (--fuzzy-k bezala).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - rpm katxetik ezabatu beste ezer baino lehen.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -p             - ez bilatu paketea hornitzaileen artean.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - rpm erabili gabe mantentzen du cache-an.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - hornitzaileetan paketeak aurkitzeko bilaketa baimentzen "
+"du.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --force        - deitzea bultzatzen du, nahiz eta pakete batzuk ez egon.\n"
+"  -a             - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
-"  --allow-nodeps - erabiltzaileari paketeak menpekotasun azterketa\n"
-"                    gabe instalatzeko aukera ematen dio.\n"
+"  --media       - komaz bereizitako euskarriak bakarrik erabiltzen ditu.\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  - erabiltzaileari paketeak menpekotasun azterketa\n"
-"                   eta osotasunik gabe instalatzeko aukera ematen dio.\n"
+"  --verify-rpm   - rpm sinadura egiaztatzen du instalazio aurretik\n"
+"                   (--no-verify-rpm ezgaitu egiten du, jatorrian gaituta "
+"dago).\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          - atera akats txosten bat hurrengo argumentuak adierazten "
-"duen\n"
-"                    direktorioan.\n"
+"  --best-output  - aukeratu interfazerik onena ingurunearen arabera:\n"
+"                   X edo testu-modua.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - X interfazea erabiltzen du.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1216,468 +1314,500 @@ msgstr ""
 "  --env          - erabili ingurune zehatza (normalean akats\n"
 "                   txostena).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - X interfazea erabiltzen du.\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  - aukeratu interfazerik onena ingurunearen arabera:\n"
-"                   X edo testu-modua.\n"
+"  --bug          - atera akats txosten bat hurrengo argumentuak adierazten "
+"duen\n"
+"                    direktorioan.\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 sinadura egiaztatzen du instalazio aurretik\n"
-"                   (--no-verify-rpm ezgaitu egiten du, jatorrian gaituta "
-"dago).\n"
+"  --proxy-user   - proxyarekin autentifikatzeko erabili beharreko "
+"erabiltzaile\n"
+"                    eta pasahitza zehaztu (formatua <erabiltzailea:"
+"pasahitza> da).\n"
 
-#: ../urpmi_.c:106
-#, fuzzy
-msgid "  --excludepath  - exclude path separated by comma.\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 ""
-"  --media       - komaz bereizitako euskarriak bakarrik erabiltzen ditu.\n"
+"  --proxy        - erabili adierazitako HTTP proxya, jatorrian 1080 portua\n"
+"                   erabiltzen da (formatua <proxyostalaria[:portua]> da).\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
-"  -a             - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"  -p             - hornitzaileetan paketeak aurkitzeko bilaketa baimentzen "
-"du.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -p             - ez bilatu paketea hornitzaileen artean.\n"
+"  --curl         - curl erabiltzen du urruneko fitxategiak berreskuratzeko.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"  -y             - hurbilketazko bilaketa behartzen du (--fuzzy-k bezala).\n"
+"  --wget         - wget erabiltzen du urruneko fitxategiak berreskuratzeko.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -s             - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - quiet modua.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modu xehetua.\n"
-
-#: ../urpmi_.c:114
-#, fuzzy
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  komando-lerroko izenak edo rpm-fitxategiak instalatuta daude.\n"
+"  --allow-force  - erabiltzaileari paketeak menpekotasun azterketa\n"
+"                   eta osotasunik gabe instalatzeko aukera ematen dio.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"urpmi: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabilita\n"
+"  --allow-nodeps - erabiltzaileari paketeak menpekotasun azterketa\n"
+"                    gabe instalatzeko aukera ematen dio.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
+"  --force        - deitzea bultzatzen du, nahiz eta pakete batzuk ez egon.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "ezin da akatsen txostenak uzteko [%s] direktorioa sortu"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - rpm erabili gabe mantentzen du cache-an.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Supererabiltzaileak bakarrik du pakete lokalak instalatzeko baimena"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - rpm katxetik ezabatu beste ezer baino lehen.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s instalatzeko, ondoko paketeetako bat behar da:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Ondoko paketeetako bat behar da:"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Zein aukeratu duzu? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - hurrengo paketea iturburu-pakete bat da (-s bezalakoa).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Lastima, aukera okerra, saiatu berriro\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr ""
+"  --fuzzy        - hurbilketazko bilaketa behartzen du (-y bezalakoa da).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Eskatutako pakete batzuk ezin dira instalatu:\n"
-"%s\n"
-"ados zaude?"
+"  --auto-select  - automatikoki sistema bertsio-berritzeko paketeak "
+"hautatzen ditu.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "ezin da %s paketea instalatu"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+" - synthesis   - erabili adierazitako sintesia urpmi db erabili beharren.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
+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-ren %s bertsioa\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Software librea da eta birbana daiteke GNU GPL-en ezarritako baldintzak "
+"betez.\n"
+"\n"
+"erabili:\n"
 
-#: ../urpmi_.c:409
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget ez dago\n"
-
-#: ../urpmi_.c:414
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s-k %s-rekin gatazka sortzen du"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "ezin da \"%s\" euskarria eguneratu\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ezin da \"%s\" euskarria sortu\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 ""
-"Ondoko paketeak kendu behar dira beste batzuk eguneratuak izan daitezen:\n"
 "%s\n"
-"ados zaude?"
+"ftp euskarriaren `(r)ekin' falta da\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak instalatuko dira"
-"(%d MB)"
+"%s\n"
+"<goiburuko-zerrendaren bide-izen erlatiboa> falta da\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 ""
-"root izan behar duzu ondorengo menpekotasunak instalatzeko:\n"
 "%s\n"
+"ez dago <goiburuko-zerrendaren bide-izen erlatiboa> --distrib erabiliz eman "
+"beharrik"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "rpm fitxategiak eskuratzen..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"aukera ezezagunak '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "\"%s\" izeneko euskarria [%s] gailuan sartu"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Prest zaudenean sakatu Sartu..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Ondorengo paketeek sinadura okerrak dituzte"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Instalazioarekin aurrera egin nahi duzu ?"
-
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr "(b/E) "
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
+"  -f             - goiburuko-zerrendaren fitxategiak sortzera behartzen du.\n"
 
-#: ../urpmi_.c:548
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
-"Huts egin du instalatzean, fitxategi batzuk falta dira.\n"
-"Zure urpmi datu-basea eguneratzea nahiko duzu "
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instalazioak huts egin du"
+"  -h             - laburpen-fitxategiak edo goiburuko-zerrendaren "
+"fitxategiak bilatzen edo erabiltzen saiatzen da.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "%s banatzen\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Mendekotasunak egiaztatu gabe instalatzen saiatu nahi duzu? (B/e) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Areago instalatzen saiatu (--force)? (b/E) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "dena dago instalatuta"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - goiburukoen cache-direktorioa garbitzen du.\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"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmq-ren %s bertsioa\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Software librea da eta birbana daiteke GNU GPLen ezarritako baldintzak betez "
-"gero.\n"
-"\n"
-"erabili:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list           - zerrendatu eskuragarri dauden paketeak.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - zerrendatu euskarri eskuragarriak.\n"
-
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --list-nodes   - zerrendatu \"--parallel\" erabiltzerakoan dauden nodo "
-"erabilgarriak.\n"
-
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-media   - zerrendatu euskarri eskuragarriak.\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --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 ""
-"  --headers      - zerrendatutako paketeen goiburukoak urpmi db-tik atera\n"
-"                   eta stdout-era eramaten ditu (root-ek bakarrik).\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  --sources      - iturburu-pakete guztiak deskargatu aurretik ematen ditu "
-"(root-ek bakarrik).\n"
+"  --env          - erabili ingurune zehatza (normalean akats\n"
+"                   txostena).\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../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 ""
-"  -d             - kontsulta paketeen mendekotasunetara zabaltzen du.\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"  -u             - paketea kendu dagoeneko bertsio berriagoa instalatuta "
-"badago.\n"
+"  --distrib      - euskarri guztiak automatikoki instalazio-euskarritik "
+"sortzen ditu.\n"
 
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    etiketarik ez badago, baina pakete-izenik gabe)."
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - euskarri eguneratua sortzen du.\n"
 
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
 msgstr ""
-"  -p             - hornitzaileetan paketeak aurkitzeko bilaketa baimentzen "
-"du.\n"
-
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - inprimatu taldeak izenarekin ere.\n"
+"erabili: urpmi.addmedia [aukerak] <izena> <url> [with <bide-izen "
+"erlatiboa>]\n"
+"non <url> hauetako bat den:\n"
+"       file://<bide-izena>\n"
+"       ftp://<erabiltzaile-izena>:<pasahitza>@<ostalaria>/<bide-izena> with "
+"<hdlist-en fitxategi-izen erlatiboa>\n"
+"       ftp://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
+"erlatiboa>\n"
+"       http://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
+"erlatiboa>\n"
+"       removable://<bide-izena>\n"
+"\n"
+"eta [aukerak] hemengoak dira:\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  -r             - inprimatu bertsioa eta askapena izenarekin batera.\n"
-
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  komando-lerroko izenak edo rpm-fitxategiak kontsultatu dira.\n"
+"kendu beharreko sarrera falta da\n"
+"(%s(e)tako bat)\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--synthesis ezin da hauekin erabili --media, --update edo --parallel"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ez dago kentzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: placeholder.h:18
+#: ../urpmi.removemedia:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf-ren %s bertsioa"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - euskarri guztiak hautatzen ditu.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"erabili: urpmi.removemedia [-a] <izena> ...\n"
+"non <izena> kendu beharreko euskarri-izena den.\n"
 
-#: placeholder.h:20
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Software librea da eta birbana daiteke GNU GPLren baldintzak betetzen badira."
+"eguneratu beharreko sarrera falta da\n"
+"(%s(e)tako bat)\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "erabili: urpmf [aukerak] <fitxategia>"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: placeholder.h:22
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-" --quiet         - ez du etiketaren izena inprimatzen (lehenetsia da komando-"
-"lerroan etiketarik ez badago;"
+"  -d             - depslist.ordered fitxategiaren kontaketa osoa bultzatzen "
+"du.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    ez da modu interaktiboarekin bateragarria)."
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - euskarri ez-aldagarri guztiak hautatzen ditu.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - etiketa guztiak inprimatzen ditu."
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - euskarri eguneratua bakarrik erabiltzen du.\n"
 
-#: placeholder.h:25
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-" --name          - etiketaren izena inprimatzen du: rpm fitxategi-izena "
+"erabili: urpmi.update [aukerak] <izena> ...\n"
+"non <izena> eguneratzeko euskarri-izena den.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    etiketarik ez badago, baina pakete-izenik gabe)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--synthesis ezin da hauekin erabili --media, --update edo --parallel"
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - etiketaren taldea inprimatzen du: taldea."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - etiketaren tamaina inprimatzen du: tamaina."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabiliz\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - etiketaren seriea inprimatzen du: seriea."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  komando-lerroko izenak edo rpm-fitxategiak kontsultatu dira.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - etiketaren laburpena inprimatzen du: laburpena."
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr ""
+"  -r             - inprimatu bertsioa eta askapena izenarekin batera.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - etiketaren azalpena inprimatzen du: azalpena."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - inprimatu taldeak izenarekin ere.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"    --provides      - etiketa-hornitzaileak inprimatzen ditu: hornitzaile "
-"guztiak (lerro anitz)."
+"  -p             - hornitzaileetan paketeak aurkitzeko bilaketa baimentzen "
+"du.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    etiketarik ez badago, baina pakete-izenik gabe)."
+
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"    --requires      - etiketaren eskakizunak inprimatzen ditu: eskakizun "
-"guztiak (lerro anitz)."
+"  -u             - paketea kendu dagoeneko bertsio berriagoa instalatuta "
+"badago.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"    --files         - etiketa-fitxategiak inprimatzen ditu: fitxategi "
-"guztiak (lerro anitz)."
+"  -d             - kontsulta paketeen mendekotasunetara zabaltzen du.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - etiketa-gatazkak inprimatzen ditu: gatazka guztiak "
-"(lerro anitz)."
+"  --sources      - iturburu-pakete guztiak deskargatu aurretik ematen ditu "
+"(root-ek bakarrik).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletes     - etiketa zaharkituak inprimatzen ditu: zaharkitu guztiak "
-"(lerro anitz)."
+"  --headers      - zerrendatutako paketeen goiburukoak urpmi db-tik atera\n"
+"                   eta stdout-era eramaten ditu (root-ek bakarrik).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-media   - zerrendatu euskarri eskuragarriak.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"    --prereqs       - etiketaren aurre-eskakizunak inprimatzen ditu: aurre-"
-"eskakizun guztiak (lerro anitz)."
+"  --list-nodes   - zerrendatu \"--parallel\" erabiltzerakoan dauden nodo "
+"erabilgarriak.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "aukera gehiagotarako, saiatu urpmf --help"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - zerrendatu euskarri eskuragarriak.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "ez da euskarri-zerrenda osorik aurkitu"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list           - zerrendatu eskuragarri dauden paketeak.\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl-ek huts egin du: %d(r)ekin edo %d seinalearekin irten du\n"
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq-ren %s bertsioa\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Software librea da eta birbana daiteke GNU GPLen ezarritako baldintzak betez "
+"gero.\n"
+"\n"
+"erabili:\n"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync falta da\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalazioak %s nodoan huts egin du"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync-ek hutsegin du: %d(r)ekin edo %d seinalearekin amaitu da\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh falta da\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "sintaxi-errorea konfigurazio-fitxategiaren %s lerroan"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "\"%s\" euskarriak, erabileran dagoen hdlist bat erabili nahi du; "
-#~ "jaramonik ez euskarriari"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Instalazioak %s nodoan huts egin du"
+
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "%s ostalariak ez dauka urpmi bertsio zuzena"
 
 #~ msgid "Remove them all?"
 #~ msgstr "Denak kendu?"
@@ -1702,13 +1832,6 @@ msgstr "ez da euskarri-zerrenda osorik aurkitu"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - laguntza-mezu hau inprimatzen du.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr ""
-#~ "urpmq: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabiliz\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi ez dago instalatuta"
 
@@ -1872,9 +1995,6 @@ msgstr "ez da euskarri-zerrenda osorik aurkitu"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "proxy deklarazio okerra komando-lerroan\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr ""
 #~ "erabili: urpmi.addmedia [aukerak] <izena> <url> [<bide-"
diff --git a/po/fake_c.pl b/po/fake_c.pl
deleted file mode 100755
index c456c7f1..00000000
--- a/po/fake_c.pl
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/perl -lp
-
-s|^(__?\()| $1|;		# add a blank at the beginning (?!)
-
-s|_\(\[(.*),\s*(.*),\s*(.*)\]|ngettext($2,$3,$1)|; # special plural form handling
-
-s,\Ws/#.*//,,;			# ugly special case
-
-s,\$#\w+,,;			# $#xxx are removed
-s,#([^+].*),"$1/*" . simpl($2) . "*/",e; 
-                                # rewrite comments to C format except for:
-                                # - ``#+ xxx'' comments which are kept
-                                # - ``$#xxx'' which are not comments
-
-s|//|/""/|g;			# ensure // or not understood as comments
-
-s|$|\\n\\|;			# multi-line strings not handled in C
-
-sub simpl {
-    local $_ = $_[0];
-    s,\*/,,g;
-    $_;
-}
diff --git a/po/fi.po b/po/fi.po
index 5bc90e21..37d2d22f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fi - MDK Release 9.1\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-02-26 00:02+0200\n"
 "Last-Translator: Thomas Backlund <tmb@iki.fi>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -20,1156 +20,1287 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "asennan %s\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 "KkYy"
+
+#. 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"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versio %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Pakettien automaattinen asennus...\n"
-"Lähetit pyynnön paketin %s asentamisesta\n"
+"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU \n"
+"GPL lisenssin mukaisesti."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Sopiiko tämä?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "käyttö: urpmf [valitsimet] <tiedosto>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet          - jätä merkintänimi tulostamatta (vakio jos ei merkintä "
+"komento"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Peruuta"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
+"                    rivissä, epäyhteensopiva vuorovaikutteisen tilan kanssa)."
 
-#: ../_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            - tulosta kaikki merkinnät."
 
-#: ../_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 "KkYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name           - tulosta merkintänimi: rpm tiedostonimi (oletettu jos ei"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (K/e) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
+"                    merkintää annettu komentorivillä ilman pakettinimiä)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group          - tulosta merkintä ryhmä: ryhmä."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size           - tulosta merkintä koko: koko."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial         - tulosta merkintä sarja: sarja."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary        - tulosta merkintä yhteenveto: yhteenveto."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description    - tulosta merkintä kuvaus: kuvaus."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides       - tulosta merkintä tarjoaa: kaikki tarjoaa (moni-rivinen)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires       - tulosta merkintä tarvitsee: kaikki tarvitsee (moni-"
+"rivinen)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files          - tulosta merkintä tiedostot: kaikki tiedostot (moni-"
+"rivinen)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts      - tulosta merkintä ristiriita: kaikki ristiriidat (moni-"
+"rivinen)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes      - tulosta merkintä vanhentaa: vanhentaa kaikki (moni-"
+"rivinen)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs        - tulosta merkintä vaaditut: kaikki vaaditut (moni-"
+"rivinen)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "kokeile urpmf --help saadaaksesi lisääoptioita."
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "täysinäistä medialuetteloa ei löytynyt"
 
-#: ../_irpm_.c:63
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: komentoa ei löytynyt\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Tuntematon webfetch '%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (K/e) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "tuntematon protokolla määrätty kohteelle %s"
+msgid "Cancel"
+msgstr "Peruuta"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "yhtäkään webfetch (curl tai wget nykyhetkellä) löydetty\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "en osaa käsitellä protokolla: '%s'"
+msgid "Is this OK?"
+msgstr "Sopiiko tämä?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kopiointi epäonnistui: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Pakettien automaattinen asennus...\n"
+"Lähetit pyynnön paketin %s asentamisesta\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget puuttuu\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "asennan %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
+msgid "unable to open rpmdb"
+msgstr "rpm tietokantaa ei voitu avata"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl puuttuu\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "ei oikeuksia rpm-tiedostoon [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "media \"%s\" yrittää käyttää jo käytössä olevaa listaa, media ohitettu"
+msgid "%s conflicts with %s"
+msgstr "%s on ristiriidassa %s kanssa"
 
-#: ../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 ""
-"en voi hoitaa media \"%s\" koska lista tiedosto on jo toisen median käytössä"
+msgid "%s is needed by %s"
+msgstr "%2$s  vaatii  %1$s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nimeä \"%s\" ei voida käyttää nimeämättömälle medialle, koska se on jo "
-"käytössä"
+msgid "unable to install package %s"
+msgstr "en voi asentaa paketti %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "media \"%s\" ei voi huomioida, koska lista tiedostoa [ %s| puuttuu"
+msgid "unable to remove package %s"
+msgstr "en voi poistaa paketti %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "mahdotonta määrittää tämän hdlist tiedoston [%s] mediaa"
+msgid "Preparing..."
+msgstr "Valmistetaan..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "en voi käyttää media \"%s\" hdlist tiedosto, media ohitetaan"
+msgid "...retrieving failed: %s"
+msgstr "...noutaminen epäonnistui: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "en voi käyttää media \"%s\" lista tiedosto, media ohitetaan"
+msgid "...retrieving done"
+msgstr "...hakeminen valmis"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "yritän ohittaa olemassa olevaa mediaa \"%s\", vältetään"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "haetaan rpm tiedostoja medialle \"%s\" ..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kohteelle \"%s\" ei löytynyt hdlist-tiedostoa, media ohitettu"
+msgid "malformed input: [%s]"
+msgstr "väärin muodostettu syöte: [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kohteelle \"%s\" ei löytynyt listatiedostoa, media ohitettu"
+msgid "unable to access medium \"%s\""
+msgstr "mediaa \"%s\" ei voitu käyttää"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "hajanainen list tiedosto kohteelle \"%s\", media ohitettu"
+msgid "urpmi database locked"
+msgstr "urpmi-tietokanta lukittu"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "en voi tarkistaa list tiedosto kohteelle \"%s\", media ohitettu"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "hajanainen media \"%s\" merkattu sirrettäväksi, vaikkei oikeastaan ole"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "liian monta yhdistämispisteitä siirrettävälle medialle \"%s\""
+msgid "medium \"%s\" is not selected"
+msgstr "mediaa \"%s\" ei ole valittu"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "käytetään siirettävä laite kohteena \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "käytetään erillinen siirrettävä laite [%s] kohteelle \"%s\""
+msgid "package %s is not found."
+msgstr "pakettia %s ei löytynyt."
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "hakemiston nimeä ei voida noutaa siirrettävälle medialle \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "media \"%s\" ei määritä yhtäkään kohdetta rpm-tiedostoille"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "asetustiedostoon [%s] ei voitu kirjoittaa "
+msgid ""
+"medium \"%s\" use an invalid list file (mirror is problably not up-to-date, "
+"trying to use alternate method)"
+msgstr ""
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "kirjoita asetustiedosto [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "löytyy monta paketteja joissa on sama rpm tiedostonimi \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "en voi tulkata \"%s\" tiedostossa [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "en voi tulkata [%s] oikein arvolla \"%s\""
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "tutkitaan rinnakkaiskäsittelijän tiedostossa [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Seuraavat paketit sisältävät %s: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "rinnakkais-käsittelijä löydetty noodeille:%s"
+msgid "no package named %s"
+msgstr "ei pakettia nimeltä %s"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "käytetään sidotut mediat rinnakkais tapaan: %s"
+msgid "error registering local packages"
+msgstr "virhe rekisteröitäessä paikalliset paketit"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "ei oikeuksia rpm-tiedostoon [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "en voi käyttää rinnakkais optiota \"%s\""
+msgid "retrieving rpm file [%s] ..."
+msgstr "haen rpm tiedosto [%s] ..."
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis ei voida käyttää --media --update tai --parallel kanssa"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "virheellinen rpm-tiedoston nimi [%s]"
 
-#: ../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 "no entries relocated in depslist"
+msgstr "ei kohteita muutettu tiedostossa depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "muutettiin %s kohteita tiedostossa depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "poistetaan liitoksen %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "liitän %s:n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "poistetaan %d ylimääräisiä otsikkotietoja välimuistista"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "välimuistista löytyi %d otsikkokenttää"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "rakenna hdlist-synteesitiedosto medialle \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "tutkitaan hdlist-tiedostoa [%s]"
 
-#: ../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]"
 msgstr "tutkitaan synteesitiedostoa [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "ongelmia luettaessa hdlist tiedostoa medialle \"%s\""
+msgid "building hdlist [%s]"
+msgstr "rakennetaan hdlist-tiedostoa [%s]"
 
-#: ../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 "reading headers from medium \"%s\""
+msgstr "luetaan otsikkotietoja mediasta  \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "suoritetaan toinen kierros riippuvuuksien määrittelemiseksi\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "ongelmia luettaessa synteesitiedostoa medialle \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "rpm tietokantaa ei voitu avata"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "media \"%s\" on jo olemassa"
+msgid "nothing written in list file for \"%s\""
+msgstr "ei kirjoitettu mitään \"%s\":n listatiedostoon"
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "media %s lisätty"
+msgid "writing list file for medium \"%s\""
+msgstr "kirjoitan listaus-tiedostoa medialle \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "en voi käyttää ensimmäinen asennusmediaa "
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "ei voida kirjoittaa listatiedostoa \"%s\":sta "
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "kopioidaan hdlists tiedostoa ..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "tiedosto [%s] on jo käytössä samassa mediassa \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "... kopiointi valmis"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "hdlist-tiedostoa \"%s\" ei voida tulkata"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "... kopiointi valmis"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "hdlist tiedostoa ei löydetty medialle \"%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)"
-msgstr ""
-"en voi käyttää ensimmäinen asennusmediaa (tiedosto Mandrake/base/hdlists  ei "
-"löydy)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "lähteen hdlistin (tai synteesin) noutaminen epäonnistui"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "haetaan hdlists tiedostoa..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "tutkitaan MD5SUM-tiedostoa"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...hakeminen valmis"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "kopioidaan lähteen \"%s\" hdlist-tiedostoa (tai synteesi)..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...noutaminen epäonnistui: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "haetaan lähteen hdlist (tai synthesis) kohteelta \"%s\""
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "virheellinen hdlist kuvaus \"%s\" hdlists tiedostossa"
+msgid "retrieving description file of \"%s\"..."
+msgstr "haetaan \"%s\" tiedoston kuvaus"
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "yritettiin valita olematon media \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "rpm-tiedostoja ei löytynyt paikasta [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "valitaan useampi media: %s"
+msgid "reading rpm files from [%s]"
+msgstr "luetaan rpm-tiedostoja kohteesta [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "poistetaan mediaa \"%s\""
+msgid "...copying done"
+msgstr "... kopiointi valmis"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi-tietokanta lukittu"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "... kopiointi valmis"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "mediaa \"%s\" ei voitu käyttää"
+msgid "copying source list of \"%s\"..."
+msgstr "kopioidaan \"%s\":n lähdelistaa..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopioidaan \"%s\" tiedoston kuvausta"
+msgid "copy of [%s] failed"
+msgstr "[%s] kopiointi epäonnistui"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopioidaan lähteen \"%s\" hdlist-tiedostoa (tai synteesi)..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "[%s] kopiointi epäonnistui"
+msgid "copying description file of \"%s\"..."
+msgstr "kopioidaan \"%s\" tiedoston kuvausta"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "tutkitaan MD5SUM-tiedostoa"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "poistetaan mediaa \"%s\""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopioidaan \"%s\":n lähdelistaa..."
+msgid "selecting multiple media: %s"
+msgstr "valitaan useampi media: %s"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "luetaan rpm-tiedostoja kohteesta [%s]"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "yritettiin valita olematon media \"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "rpm-tiedostoja ei löytynyt paikasta [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"en voi käyttää ensimmäinen asennusmediaa (tiedosto Mandrake/base/hdlists  ei "
+"löydy)"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "haetaan \"%s\" tiedoston kuvaus"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "virheellinen hdlist kuvaus \"%s\" hdlists tiedostossa"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "haetaan lähteen hdlist (tai synthesis) kohteelta \"%s\""
+msgid "retrieving hdlists file..."
+msgstr "haetaan hdlists tiedostoa..."
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "lähteen hdlistin (tai synteesin) noutaminen epäonnistui"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying hdlists file..."
+msgstr "kopioidaan hdlists tiedostoa ..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "hdlist tiedostoa ei löydetty medialle \"%s\""
+msgid "unable to access first installation medium"
+msgstr "en voi käyttää ensimmäinen asennusmediaa "
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "tiedosto [%s] on jo käytössä samassa mediassa \"%s\""
+msgid "added medium %s"
+msgstr "media %s lisätty"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "hdlist-tiedostoa \"%s\" ei voida tulkata"
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" on jo olemassa"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ei voida kirjoittaa listatiedostoa \"%s\":sta "
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "ongelmia luettaessa hdlist tiedostoa medialle \"%s\""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "kirjoitan listaus-tiedostoa medialle \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis ei voida käyttää --media --update tai --parallel kanssa"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ei kirjoitettu mitään \"%s\":n listatiedostoon"
+msgid "unable to use parallel option \"%s\""
+msgstr "en voi käyttää rinnakkais optiota \"%s\""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "suoritetaan toinen kierros riippuvuuksien määrittelemiseksi\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "käytetään sidotut mediat rinnakkais tapaan: %s"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "luetaan otsikkotietoja mediasta  \"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr "rinnakkais-käsittelijä löydetty noodeille:%s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "rakennetaan hdlist-tiedostoa [%s]"
+msgid "examining parallel handler in file [%s]"
+msgstr "tutkitaan rinnakkaiskäsittelijän tiedostossa [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "rakenna hdlist-synteesitiedosto medialle \"%s\""
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "en voi tulkata \"%s\" tiedostossa [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "välimuistista löytyi %d otsikkokenttää"
+msgid "write config file [%s]"
+msgstr "kirjoita asetustiedosto [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "poistetaan %d ylimääräisiä otsikkotietoja välimuistista"
+msgid "unable to write config file [%s]"
+msgstr "asetustiedostoon [%s] ei voitu kirjoittaa "
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "liitän %s:n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "hakemiston nimeä ei voida noutaa siirrettävälle medialle \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "poistetaan liitoksen %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "käytetään erillinen siirrettävä laite [%s] kohteelle \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "muutettiin %s kohteita tiedostossa depslist"
+msgid "taking removable device as \"%s\""
+msgstr "käytetään siirettävä laite kohteena \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "ei kohteita muutettu tiedostossa depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "liian monta yhdistämispisteitä siirrettävälle medialle \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "virheellinen rpm-tiedoston nimi [%s]"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "en voi tarkistaa list tiedosto kohteelle \"%s\", media ohitettu"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "haen rpm tiedosto [%s] ..."
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "hajanainen list tiedosto kohteelle \"%s\", media ohitettu"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ei oikeuksia rpm-tiedostoon [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kohteelle \"%s\" ei löytynyt listatiedostoa, media ohitettu"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ei oikeuksia rpm-tiedostoon [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kohteelle \"%s\" ei löytynyt hdlist-tiedostoa, media ohitettu"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "virhe rekisteröitäessä paikalliset paketit"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "yritän ohittaa olemassa olevaa mediaa \"%s\", vältetään"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "ei pakettia nimeltä %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "en voi käyttää media \"%s\" lista tiedosto, media ohitetaan"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Seuraavat paketit sisältävät %s: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "en voi käyttää media \"%s\" hdlist tiedosto, media ohitetaan"
 
-#: ../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\""
-msgstr "löytyy monta paketteja joissa on sama rpm tiedostonimi \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "mahdotonta määrittää tämän hdlist tiedoston [%s] mediaa"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "en voi tulkata [%s] oikein arvolla \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "media \"%s\" ei voi huomioida, koska lista tiedostoa [ %s| puuttuu"
 
-#: ../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 "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
+"nimeä \"%s\" ei voida käyttää nimeämättömälle medialle, koska se on jo "
+"käytössä"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "media \"%s\" ei määritä yhtäkään kohdetta rpm-tiedostoille"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"en voi hoitaa media \"%s\" koska lista tiedosto on jo toisen median käytössä"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "pakettia %s ei löytynyt."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "media \"%s\" yrittää käyttää jo käytössä olevaa listaa, media ohitettu"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "mediaa \"%s\" ei ole valittu"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"media \"%s\" yrittää käyttää jo käytettyä hdlist-tiedostoa, media ohitettu"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "syntaksivirhe asetustiedostossa rivissä %s"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "hajanainen media \"%s\" merkattu sirrettäväksi, vaikkei oikeastaan ole"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% valmis, nopeus = %s"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "väärin muodostettu syöte: [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% / %s, aika-arvio = %s, nopeus = %s"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "haetaan rpm tiedostoja medialle \"%s\" ..."
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Valmistetaan..."
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "en voi poistaa paketti %s"
+msgid "ssh is missing\n"
+msgstr "ssh puuttuu\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "en voi asentaa paketti %s"
+msgid "rsync is missing\n"
+msgstr "rsync puuttuu\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%2$s  vaatii  %1$s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s on ristiriidassa %s kanssa"
-
-#: ../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 epäonnistui, ehkä joku noodi ei vastaa"
-
-#: ../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 epäonnistui, ehkä joku noodi ei vastaa"
+msgid "curl is missing\n"
+msgstr "curl puuttuu\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "noodissa %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget epäonnistui: lopetti arvolla %d tai signaalilla %d\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 "Asennus epäonnistui noodissa %s"
+msgid "wget is missing\n"
+msgstr "wget puuttuu\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 "Asennus  on mahdollinen"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "kopiointi epäonnistui: %s"
 
-#: ../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 epäonnistui verkkoasemalla %s"
+msgid "unable to handle protocol: %s"
+msgstr "en osaa käsitellä protokolla: '%s'"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "verkkoasemalla %s ei ole oikea urpmi versio "
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "yhtäkään webfetch (curl tai wget nykyhetkellä) löydetty\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 ""
-"urpmi versio %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
-"mukaisesti.\n"
-"\n"
-"käyttö:\n"
+msgid "unknown protocol defined for %s"
+msgstr "tuntematon protokolla määrätty kohteelle %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          - tulosta tämä viesti.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Tuntematon webfetch '%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto          - valitse automaattisesti paketit tarvittaessa.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Poistaminen epäonnistui"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test          - varmista että asennusta voidaan hoitaa oikein.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit poistetaan (%d Mt)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel      - urpmi jaettu yli koneita aliaksella.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Suoritetaan tarkistusta seuraavien pakettien poistamiseksi"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a              - valitse kaikki yhteensopivuuksia kommentojonossa.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ei mitään poistettavissa."
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: tuntematon parametri \"-%s\", tarkista ohjelman käyttö: --help\n"
+msgid "removing package %s will break your system"
+msgstr "%s paketin poistaminen rikkoo järjestelmäsi"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "tuntematon paketti"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "tuntemattomia paketteja "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "%s paketin poistaminen rikkoo järjestelmäsi"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmi: tuntematon parametri \"-%s\", tarkista ohjelman käyttö: --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Ei mitään poistettavissa."
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a              - valitse kaikki yhteensopivuuksia kommentojonossa.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Suoritetaan tarkistusta seuraavien pakettien poistamiseksi"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel      - urpmi jaettu yli koneita aliaksella.\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 "Riippuvuuksien täyttämiseksi seuraavat paketit poistetaan (%d Mt)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test          - varmista että asennusta voidaan hoitaa oikein.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Poistaminen epäonnistui"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto          - valitse automaattisesti paketit tarvittaessa.\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          - tulosta tämä viesti.\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 versio %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmi versio %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
 "mukaisesti.\n"
 "\n"
 "käyttö:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
-
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
-"  --media         - käytä ainoastaan seuraava(t) media(t) pilkulla "
-"erotettuina.\n"
+"takasinsoitto on:\n"
+"%s\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-"  --synthesis     - käytä annettu synthesis tiedostoa urpmi tietokannan "
-"sijasta.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )               - oikea sulkumerkki lauseke-ryhmän sulkemiseen.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose       - yksityiskohtainen tyyli.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (               - vasen sulkumerkki lauseke-ryhmän avaamiseen.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !               - binäärinen NOT, oikea jos lauseke on väärä.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - jätä merkintänimi tulostamatta (oletus jos ei merkintä \n"
-"                    annettu komentorivissä, ei yhteensopiva interaktiivisen\n"
-"                    tilan kanssa).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - tulosta kaikki merkinnät.\n"
+"  -o              - binäärinen OR operaattori, oikea jos yksi lausekkeista\n"
+"                    on oikea.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - tulosta merkintänimi: rpm tiedostonimi (oletus jos ei \n"
-"                    merkintä annettu komentorivillä mutta ilman "
-"pakettinimi).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - tulosta merkintä ryhmä: ryhmä.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - tulosta merkintä koko: koko.\n"
-
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch         - tulosta merkintä aikakausi: aikakausi.\n"
-
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - tulosta merkintä yhteenveto: yhteenveto.\n"
+"  -a              - binäärinen AND operaattori, oikea jos molemmat "
+"lausekkeet\n"
+"                    ovat oikeat.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - tulosta merkintä kuvaus: kuvaus.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e              - sisällytä perl-koodia suoraan 'perl -e'.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --provides      - tulosta merkintä tarjoaa: kaikki tarjoaa (moni-"
-"rivinen).\n"
+"  -f              - tulosta versio, julkaisu ja arkkitehtuuri myös nimellä.\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
-"  --requires      - tulosta merkintä tarvitsee: kaikki tarvitsee\n"
-"                    (moni-rivinen).\n"
+"  -i              - jätä huomiotta isojen/pienten kirjasinten erottelu \n"
+"                    hakuehdoissa.\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --files         - tulosta merkintä tiedostot: kaikki tiedostot \n"
+"  --obsoletes     - tulosta merkintä vanhentaa: vanhentaa kaikki\n"
 "                    (moni-rivinen).\n"
 
-#: ../urpmf_.c:49
+#: ../urpmf:1
+#, c-format
 msgid ""
 "  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 "  --conflicts     - tulosta merkintä ristiriita: kaikki ristiriidat \n"
 "                    (moni-rivinen).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - tulosta merkintä vanhentaa: vanhentaa kaikki\n"
+"  --files         - tulosta merkintä tiedostot: kaikki tiedostot \n"
 "                    (moni-rivinen).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i              - jätä huomiotta isojen/pienten kirjasinten erottelu \n"
-"                    hakuehdoissa.\n"
-
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  -f              - tulosta versio, julkaisu ja arkkitehtuuri myös nimellä.\n"
-
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e              - sisällytä perl-koodia suoraan 'perl -e'.\n"
+"  --requires      - tulosta merkintä tarvitsee: kaikki tarvitsee\n"
+"                    (moni-rivinen).\n"
 
-#: ../urpmf_.c:54
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  -a              - binäärinen AND operaattori, oikea jos molemmat "
-"lausekkeet\n"
-"                    ovat oikeat.\n"
+"  --provides      - tulosta merkintä tarjoaa: kaikki tarjoaa (moni-"
+"rivinen).\n"
 
-#: ../urpmf_.c:55
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o              - binäärinen OR operaattori, oikea jos yksi lausekkeista\n"
-"                    on oikea.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - tulosta merkintä kuvaus: kuvaus.\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !               - binäärinen NOT, oikea jos lauseke on väärä.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - tulosta merkintä yhteenveto: yhteenveto.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (               - vasen sulkumerkki lauseke-ryhmän avaamiseen.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch         - tulosta merkintä aikakausi: aikakausi.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )               - oikea sulkumerkki lauseke-ryhmän sulkemiseen.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - tulosta merkintä koko: koko.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"takasinsoitto on:\n"
-"%s\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - tulosta merkintä ryhmä: ryhmä.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"käyttö: urpmi.addmedia [valitsimet] <nimi> <url> "
-"[<relaatiivisen_polun_kanssa>]\n"
-"missä <url> on yksi seuraavista\n"
-"       file://<polku>\n"
-"       ftp://<käyttäjätunnus>:<salasana>@<kone>/<polku> with <hdlist-"
-"tiedoston relatiivinen nimi>\n"
-"       ftp://<kone>/<polku> with <hdlist-tiedoston relatiivinen nimi>\n"
-"       http://<kone>/<polku> with <hdlist-tiedoston relatiivinen nimi>\n"
-"       removable://<polku>\n"
-"\n"
-"ja [valitsimet] ovat\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          - käytä wget etätiedostojen hakemiseen.\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          - käytä curl etätiedostojen hakemiseen.\n"
-
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate    - rajoita latausnopeus.\n"
+"  --name          - tulosta merkintänimi: rpm tiedostonimi (oletus jos ei \n"
+"                    merkintä annettu komentorivillä mutta ilman "
+"pakettinimi).\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         - käytä määrätty HTTP välityspalvelin, porttinumero\n"
-"                    oletetaan olevan 1080 (muodossa <välityspalvelin [:"
-"portti]>).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - tulosta kaikki merkinnät.\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"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --proxy-user    - määrittele käyttäjä ja salasana välityspalvelimen\n"
-"                    todentamisessa (muodossa <käyttäjä:salasana>).\n"
+"  --quiet         - jätä merkintänimi tulostamatta (oletus jos ei merkintä \n"
+"                    annettu komentorivissä, ei yhteensopiva interaktiivisen\n"
+"                    tilan kanssa).\n"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update        - luo päivitysmediaa.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose       - yksityiskohtainen tyyli.\n"
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  --distrib       - luo automaattisesti kaikki mediat asennusmedioista\n"
+"  --synthesis     - käytä annettu synthesis tiedostoa urpmi tietokannan "
+"sijasta.\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"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  --distrib-XXX   - luo automaattisesti median XXX osan\n"
-"                    jakelusta, XXX voi olla 'main', 'contrib', 'updates'\n"
-"                    tai jotain muuta joka on jo määritetty ;-)\n"
+"  --media         - käytä ainoastaan seuraava(t) media(t) pilkulla "
+"erotettuina.\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from          - käytä määritetty peilipalvelinten listan osoitetta, "
-"oletus:\n"
-"                    %s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
 
-#: ../urpmi.addmedia_.c:69
+#: ../urpmf: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"
+"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 ""
-"  --version       - käytä määritetty jakeluversio, oletuksena otetaan\n"
-"                    asennetusta mandrake-release paketin versiosta.\n"
+"urpmf versio %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
+"mukaisesti.\n"
+"\n"
+"käyttö:\n"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch          - käytä määritetty arkkitehtuuri, oletuksena on asennetun\n"
-"                    mandrake-release paketin arkkitehtuuri.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "kaikki on jo asennettu"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c              - puhdista otsikkotietojen välimuistihakemisto.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Asennus  on mahdollinen"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h              - yritä etsiä ja käyttää synthesis tai hdlist tiedostoa.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Asennus epäonnistui"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f              - pakota hdlist tiedostojen luominen.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Yritä asentaa pakolla (--force)? (k/E) "
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "en voi lisätä cooker jakelun päivityksiä\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Yritä asentaa ilman riippuvuuksia? (k/E) "
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "levitetään %s\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 ""
+"Asennus epäonnistui, joitakin paketteja puuttuvat:\n"
 "%s\n"
-"ei tarvetta antaa <hdlist:in relatiivinen polku>-kohtaa --distib -parametrin "
-"kanssa"
+"Sinun kannattaisi päivittää urpmi tietokantaa"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "mediaa \"%s\" ei voida päivittää\n"
+msgid " (y/N) "
+msgstr " (k/E) "
+
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Haluatko jatkaa asennuksen ?"
+
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
+
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Paina enteriä tehtyäsi sen..."
+
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
+
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan (%d Mt)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Sinun pitää olla pääkäyttäjänä asentaaksesi seuraavat riippuvuudet:\n"
 "%s\n"
-"<hdlist:in relatiivinen polku> puuttuu\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 ""
+"Seuraavat paketit pitää poistaa jotta toiset voidaan päivittää:\n"
 "%s\n"
-"ftp-median kohta \"with\" puuttuu\n"
+"hyväksytkö?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "mediaa \"%s\" ei voida luoda\n"
+msgid "unrequested"
+msgstr "ei pyydetty"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"käyttö: urpmi.removemedia [-a] <nimi> ...\n"
-"jossa <nimi> on poistettavan median nimi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "ristiriidan takia %s kanssa"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a              - valitse kaikki mediat.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "puuttuvan %s takia"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tuntemattomat valitsimet '%s'\n"
+msgid "due to unsatisfied %s"
+msgstr "täyttämättömän %s takia"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ei mitään poistettavaa (käytä urpmi.addmedia lisätääksesi median)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "asentaakseni %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 ""
-"Poistettava kohta puuttuu\n"
-"(yksi seuraavista: %s)\n"
+"Joitakin haluttuja paketteja ei voida asentaa:\n"
+"%s\n"
+"hyväksytkö?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"käyttö: urpmi.update [valitsimet] <nimi> ...\n"
-"jossa <nimi> on päivitettävän median nimi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Mikä on valintasi? ( 1 - %d) : "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a              - valitse kaikki ei-siirrettävät mediat.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Yksi seuraavista paketeista tarvitaan:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d              - pakota täydellinen laskenta depslist.ordered "
-"tiedostolle.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Yksi seuraavista paketeista täytyy asentaa: %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätääksesi median)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Vain pääkäyttäjä saa asentaa paketteja"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Päivitettävä kohta puuttuu\n"
-"(yksi seuraavista: %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "käytetään määrätty ympäristö kohteessa %s\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 "Hakemiston [%s] luominen virheraportille ei onnistu"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Mitä voidaan tehdä binääri rpm-tiedostolla kun käytetään --install-src"
+
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"urpmi versio %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
-"mukaisesti.\n"
-"\n"
-"käyttö:\n"
+"urpmi: tuntematon parametri \"-%s\", tarkista ohjelman käyttö: --help\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  --synthesis     - käytä annettu synthesis tiedostoa urpmi tietokannan "
-"sijasta.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select   - valitse automaattisesti päivitettävät paketit.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  komentorivissä syötetyt nimet tai rpm-tiedostot asennetaan.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy         - käytä epätarkka haku (sama kuin -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v              - yksityiskohtainen tyyli.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src           - seuraava paketti on lähdekoodi-paketti (sama kuin -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q              - hiljainen tyyli.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --install-src   - asenna ainoastaan lähdekoodipaketit (ei binäärejä).\n"
+"  -s              - seuraava paketti on lähdekoodi paketti (sama kuin --"
+"src).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y              - käytä epätarkka haku (sama kuin --fuzzy).\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
-"  --clean         - poista rpm paketti välimuistista ennen muita "
-"tapahtumia.\n"
+"  -P              - älä etsi 'tarjoaa' tiedoista löydääkseen pakettia.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean       - pidä käyttämätön rpm paketti välimuistissa.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p              - sallii etsiminen 'tarjoaa' tiedoista löydääkseen "
+"paketin.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --force         - pakottaa asennuksen vaikka joitakin paketteja puuttuu.\n"
+"  -a              - valitse kaikki yhteensopivuuksia kommentojonossa.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
-"  --allow-nodeps  - sallii pakettien asennuksen ilman\n"
-"                    riippuvuuksien tarkistusta.\n"
+"  --excludepath   - jätä asentamatta suraaviin hakemistoihin\n"
+"                    (hakemistot pikulla erotettuna)\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   - sallii pakettien asennuksen ilman\n"
-"                    riippuvuuksien ja ehytys-tarkistusta.\n"
+"  --verify-rpm    - varmista rpm allekirjoitusta ennen asennusta\n"
+"                    (--no-verify-rpm poistaa käytöstä, vakiona käytössä).\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           - kirjoittaa virheraportin hakemistoon joka määritellään\n"
-"                    seuraavassa argumentissa.\n"
+"  --best-output   - valitse paras käyttöliittymä ympäristön mukaan:\n"
+"                    X tai teksti tilassa.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X             - käytä X käyttöliittymää.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1177,459 +1308,495 @@ msgstr ""
 "  --env           - käytä määrätty ympäristö (yleensä virhe\n"
 "                    raportti).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X             - käytä X käyttöliittymää.\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   - valitse paras käyttöliittymä ympäristön mukaan:\n"
-"                    X tai teksti tilassa.\n"
+"  --bug           - kirjoittaa virheraportin hakemistoon joka määritellään\n"
+"                    seuraavassa argumentissa.\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"
-msgstr ""
-"  --verify-rpm    - varmista rpm allekirjoitusta ennen asennusta\n"
-"                    (--no-verify-rpm poistaa käytöstä, vakiona käytössä).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --excludepath   - jätä asentamatta suraaviin hakemistoihin\n"
-"                    (hakemistot pikulla erotettuna)\n"
+"  --proxy-user    - määrittele käyttäjä ja salasana välityspalvelimen\n"
+"                    todentamisessa (muodossa <käyttäjä:salasana>).\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\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 ""
-"  -a              - valitse kaikki yhteensopivuuksia kommentojonossa.\n"
+"  --proxy         - käytä määrätty HTTP välityspalvelin, porttinumero\n"
+"                    oletetaan olevan 1080 (muodossa <välityspalvelin [:"
+"portti]>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p              - sallii etsiminen 'tarjoaa' tiedoista löydääkseen "
-"paketin.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate    - rajoita latausnopeus.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P              - älä etsi 'tarjoaa' tiedoista löydääkseen pakettia.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl          - käytä curl etätiedostojen hakemiseen.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y              - käytä epätarkka haku (sama kuin --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget          - käytä wget etätiedostojen hakemiseen.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -s              - seuraava paketti on lähdekoodi paketti (sama kuin --"
-"src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q              - hiljainen tyyli.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v              - yksityiskohtainen tyyli.\n"
-
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  komentorivissä syötetyt nimet tai rpm-tiedostot asennetaan.\n"
+"  --allow-force   - sallii pakettien asennuksen ilman\n"
+"                    riippuvuuksien ja ehytys-tarkistusta.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"urpmi: tuntematon parametri \"-%s\", tarkista ohjelman käyttö: --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Mitä voidaan tehdä binääri rpm-tiedostolla kun käytetään --install-src"
+"  --allow-nodeps  - sallii pakettien asennuksen ilman\n"
+"                    riippuvuuksien tarkistusta.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Hakemiston [%s] luominen virheraportille ei onnistu"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force         - pakottaa asennuksen vaikka joitakin paketteja puuttuu.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "käytetään määrätty ympäristö kohteessa %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Vain pääkäyttäjä saa asentaa paketteja"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean       - pidä käyttämätön rpm paketti välimuistissa.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Yksi seuraavista paketeista täytyy asentaa: %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean         - poista rpm paketti välimuistista ennen muita "
+"tapahtumia.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Yksi seuraavista paketeista tarvitaan:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src   - asenna ainoastaan lähdekoodipaketit (ei binäärejä).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Mikä on valintasi? ( 1 - %d) : "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src           - seuraava paketti on lähdekoodi-paketti (sama kuin -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy         - käytä epätarkka haku (sama kuin -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 ""
-"Joitakin haluttuja paketteja ei voida asentaa:\n"
-"%s\n"
-"hyväksytkö?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select   - valitse automaattisesti päivitettävät paketit.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "asentaakseni %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis     - käytä annettu synthesis tiedostoa urpmi tietokannan "
+"sijasta.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "täyttämättömän %s takia"
+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 versio %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
+"mukaisesti.\n"
+"\n"
+"käyttö:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "puuttuvan %s takia"
+msgid "unable to update medium \"%s\"\n"
+msgstr "mediaa \"%s\" ei voida päivittää\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "ristiriidan takia %s kanssa"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "ei pyydetty"
+msgid "unable to create medium \"%s\"\n"
+msgstr "mediaa \"%s\" ei voida luoda\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 ""
-"Seuraavat paketit pitää poistaa jotta toiset voidaan päivittää:\n"
 "%s\n"
-"hyväksytkö?"
+"ftp-median kohta \"with\" puuttuu\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 "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan (%d Mt)"
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
+"%s\n"
+"<hdlist:in relatiivinen polku> puuttuu\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 ""
-"Sinun pitää olla pääkäyttäjänä asentaaksesi seuraavat riippuvuudet:\n"
 "%s\n"
+"ei tarvetta antaa <hdlist:in relatiivinen polku>-kohtaa --distib -parametrin "
+"kanssa"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "haen rpm tiedosto [%s] ..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% / %s, aika-arvio = %s, nopeus = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "en voi lisätä cooker jakelun päivityksiä\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% valmis, nopeus = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"tuntemattomat valitsimet '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Paina enteriä tehtyäsi sen..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Haluatko jatkaa asennuksen ?"
-
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (k/E) "
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f              - pakota hdlist tiedostojen luominen.\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"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
-"Asennus epäonnistui, joitakin paketteja puuttuvat:\n"
-"%s\n"
-"Sinun kannattaisi päivittää urpmi tietokantaa"
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Asennus epäonnistui"
+"  -h              - yritä etsiä ja käyttää synthesis tai hdlist tiedostoa.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "levitetään %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Yritä asentaa ilman riippuvuuksia? (k/E) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Yritä asentaa pakolla (--force)? (k/E) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "kaikki on jo asennettu"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c              - puhdista otsikkotietojen välimuistihakemisto.\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"
-"\n"
-"usage:\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"urpmq versio %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
-"mukaisesti.\n"
-"\n"
-"käyttö:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list          - listaa käytettävissä olevat paketit.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media    - listaa käytettävissä olevat mediat.\n"
+"  --arch          - käytä määritetty arkkitehtuuri, oletuksena on asennetun\n"
+"                    mandrake-release paketin arkkitehtuuri.\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../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 ""
-"  --list-nodes    - listaa käytettävissä olevat noodit, käytössä --"
-"parallel.\n"
-"                    (ainoastaan pääkäyttäjänä).\n"
-
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases  - listaa käytettävissä rinnakkais-aliakset.\n"
+"  --version       - käytä määritetty jakeluversio, oletuksena otetaan\n"
+"                    asennetusta mandrake-release paketin versiosta.\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  --headers       - purkaa otsikkotiedot urpmi tietokannan pakettilistasta\n"
-"                    näytölle (ainoastaan pääkäyttäjänä).\n"
+"  --from          - käytä määritetty peilipalvelinten listan osoitetta, "
+"oletus:\n"
+"                    %s\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources       - listaa kaikki lähdekoodipaketit ennen hakeminen.\n"
-
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+"  --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 ""
-"  -d              - laajenna haku sisältämään pakettien riippuvuuksia.\n"
+"  --distrib-XXX   - luo automaattisesti median XXX osan\n"
+"                    jakelusta, XXX voi olla 'main', 'contrib', 'updates'\n"
+"                    tai jotain muuta joka on jo määritetty ;-)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"  -u              - poista paketti jos uudempi versio on jo asennettu.\n"
+"  --distrib       - luo automaattisesti kaikki mediat asennusmedioista\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c              - täydellinen tuloste poistettavasta paketista.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update        - luo päivitysmediaa.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
 msgstr ""
-"  -R              - käänteinen etsiminen 'vaatii' tiedoista paketeissa.\n"
-
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g              - tulosta ryhmät myös nimellä.\n"
-
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r              - tulosta versio ja julkaisu myös nimellä.\n"
+"käyttö: urpmi.addmedia [valitsimet] <nimi> <url> "
+"[<relaatiivisen_polun_kanssa>]\n"
+"missä <url> on yksi seuraavista\n"
+"       file://<polku>\n"
+"       ftp://<käyttäjätunnus>:<salasana>@<kone>/<polku> with <hdlist-"
+"tiedoston relatiivinen nimi>\n"
+"       ftp://<kone>/<polku> with <hdlist-tiedoston relatiivinen nimi>\n"
+"       http://<kone>/<polku> with <hdlist-tiedoston relatiivinen nimi>\n"
+"       removable://<polku>\n"
+"\n"
+"ja [valitsimet] ovat\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  komentorivissä syötetyt nimet tai rpm-tiedostot etsitään.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"Poistettava kohta puuttuu\n"
+"(yksi seuraavista: %s)\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes voidaan ainoastaan käyttää --parallel kanssa"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ei mitään poistettavaa (käytä urpmi.addmedia lisätääksesi median)\n"
 
-#: placeholder.h:18
+#: ../urpmi.removemedia:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versio %s"
+msgid "  -a             - select all media.\n"
+msgstr "  -a              - valitse kaikki mediat.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"käyttö: urpmi.removemedia [-a] <nimi> ...\n"
+"jossa <nimi> on poistettavan median nimi.\n"
 
-#: placeholder.h:20
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU \n"
-"GPL lisenssin mukaisesti."
+"Päivitettävä kohta puuttuu\n"
+"(yksi seuraavista: %s)\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "käyttö: urpmf [valitsimet] <tiedosto>"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätääksesi median)\n"
 
-#: placeholder.h:22
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  --quiet          - jätä merkintänimi tulostamatta (vakio jos ei merkintä "
-"komento"
+"  -d              - pakota täydellinen laskenta depslist.ordered "
+"tiedostolle.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr ""
-"                    rivissä, epäyhteensopiva vuorovaikutteisen tilan kanssa)."
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a              - valitse kaikki ei-siirrettävät mediat.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all            - tulosta kaikki merkinnät."
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
 
-#: placeholder.h:25
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  --name           - tulosta merkintänimi: rpm tiedostonimi (oletettu jos ei"
+"käyttö: urpmi.update [valitsimet] <nimi> ...\n"
+"jossa <nimi> on päivitettävän median nimi.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr ""
-"                    merkintää annettu komentorivillä ilman pakettinimiä)."
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes voidaan ainoastaan käyttää --parallel kanssa"
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group          - tulosta merkintä ryhmä: ryhmä."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ei voida lukea rpm-tiedostoa \"%s\"\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size           - tulosta merkintä koko: koko."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: tuntematon valitsin \"-%s\", tarkista ohjelman käyttö: --help\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial         - tulosta merkintä sarja: sarja."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  komentorivissä syötetyt nimet tai rpm-tiedostot etsitään.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary        - tulosta merkintä yhteenveto: yhteenveto."
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r              - tulosta versio ja julkaisu myös nimellä.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description    - tulosta merkintä kuvaus: kuvaus."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g              - tulosta ryhmät myös nimellä.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"  --provides       - tulosta merkintä tarjoaa: kaikki tarjoaa (moni-rivinen)."
+"  -R              - käänteinen etsiminen 'vaatii' tiedoista paketeissa.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c              - täydellinen tuloste poistettavasta paketista.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --requires       - tulosta merkintä tarvitsee: kaikki tarvitsee (moni-"
-"rivinen)."
+"  -u              - poista paketti jos uudempi versio on jo asennettu.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"  --files          - tulosta merkintä tiedostot: kaikki tiedostot (moni-"
-"rivinen)."
+"  -d              - laajenna haku sisältämään pakettien riippuvuuksia.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr ""
-"  --conflicts      - tulosta merkintä ristiriita: kaikki ristiriidat (moni-"
-"rivinen)."
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources       - listaa kaikki lähdekoodipaketit ennen hakeminen.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletes      - tulosta merkintä vanhentaa: vanhentaa kaikki (moni-"
-"rivinen)."
+"  --headers       - purkaa otsikkotiedot urpmi tietokannan pakettilistasta\n"
+"                    näytölle (ainoastaan pääkäyttäjänä).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases  - listaa käytettävissä rinnakkais-aliakset.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --prereqs        - tulosta merkintä vaaditut: kaikki vaaditut (moni-"
-"rivinen)."
+"  --list-nodes    - listaa käytettävissä olevat noodit, käytössä --"
+"parallel.\n"
+"                    (ainoastaan pääkäyttäjänä).\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "kokeile urpmf --help saadaaksesi lisääoptioita."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media    - listaa käytettävissä olevat mediat.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "täysinäistä medialuetteloa ei löytynyt"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list          - listaa käytettävissä olevat paketit.\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versio %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
+"mukaisesti.\n"
+"\n"
+"käyttö:\n"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync puuttuu\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Asennus epäonnistui noodissa %s"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp epäonnistui, ehkä joku noodi ei vastaa"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh puuttuu\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput epäonnistui, ehkä joku noodi ei vastaa"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "syntaksivirhe asetustiedostossa rivissä %s"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "noodissa %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "media \"%s\" yrittää käyttää jo käytettyä hdlist-tiedostoa, media ohitettu"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp epäonnistui verkkoasemalla %s"
+
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "verkkoasemalla %s ei ole oikea urpmi versio "
 
 #~ msgid "ignoring option \"%s\" not used"
 #~ msgstr "ohitan optio, \"%s\" ei käytetty"
@@ -1658,13 +1825,6 @@ msgstr "täysinäistä medialuetteloa ei löytynyt"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - tulosta tämä viesti.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr ""
-#~ "urpmq: tuntematon valitsin \"-%s\", tarkista ohjelman käyttö: --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: ei voida lukea rpm-tiedostoa \"%s\"\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr "synteesitiedostoa ei voida rakentaa medialle \"%s\""
 
diff --git a/po/fr.po b/po/fr.po
index 337637ca..d4426fa8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,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: 2002-12-24 11:14+0400\n"
 "Last-Translator: Guy CLOTILDE <guy.clotilde@wanadoo.fr>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -18,1174 +18,1303 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "installation de %s\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 "OoYy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "version urpmf %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Installation automatique des paquetages...\n"
-"Vous avez demand� l'installation du paquetage %s\n"
+"Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
+"licence GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Est-ce correct�?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "utilisation: urpmf [options] <fichier>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "OK"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"   --quiet        - ne pas afficher le nom des champs (actif par d�faut si "
+"aucun champ "
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Annuler"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
+"                   sur la ligne de commande, incompatible avec le mode "
+"interactif)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - afficher tous les champs"
 
-#: ../_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 "OoYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name       - affiche le champ ��name���: nom du fichier rpm (par d�faut "
+"si aucun champ"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (O/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
+"                    sur la ligne de commande mais sans nom de paquetage)"
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - afficher le champ ��group���: groupe"
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - afficher le champ ��size���: taille."
 
-#: ../_irpm_.c:63
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - afficher le champ ��serial���: num�ro de s�rie."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - afficher le champ ��summary���: r�sum�."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - afficher le champ ��description���: description."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - afficher le champ ��provides���: tous les apports (multi-"
+"lignes)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - afficher le champ ��requires���: toutes les d�pendances "
+"(multi-lignes)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - afficher le champ ��files���: tous les fichiers (multi-"
+"lignes)."
+
+# �
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - afficher le champ ��conflicts���: tous les conflits "
+"(multi-lignes)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - afficher le champ ��obsoletes���: toutes les "
+"obsolescences (multi-lignes)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - afficher le tag ��prereqs���: toutes les d�pendances "
+"pr�liminaires(multi-lignes)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "essayez ��urpmf --help�� pour plus d'options"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "aucune liste de source compl�te n'a pu �tre trouv�e"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: commande non trouv�e\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Programme inconnu de rapatriement de pages web ��%s���!!!\n"
+msgid " (Y/n) "
+msgstr " (O/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocole inconnu d�fini pour %s"
+msgid "Cancel"
+msgstr "Annuler"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "aucun programme de rapatriement de pages web (curl ou wget) trouv�\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "impossible d'utiliser le protocole: %s"
+msgid "Is this OK?"
+msgstr "Est-ce correct�?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "echec de la copie: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Installation automatique des paquetages...\n"
+"Vous avez demand� l'installation du paquetage %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget n'est pas install�\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "installation de %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget a �chou�: sortie avec le code %d ou tu� par le signal %d\n"
+msgid "unable to open rpmdb"
+msgstr "impossible d'ouvrir la base de donn�e rpm"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl n'est pas install�\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "impossible d'acc�der au fichier rpm [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"la source ��%s�� essaye d'utiliser une liste d�j� utilis�e, source ignor�e"
+msgid "%s conflicts with %s"
+msgstr "%s est en conflit avec %s"
 
-#: ../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 ""
-"impossible de tenir compte de ��%s�� car la liste de fichiers est d�j� "
-"utilis�e par une autre source"
+msgid "%s is needed by %s"
+msgstr "%s est n�cessaire � %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"impossible d'utiliser le nom ��%s�� pour la source non nomm�e car ce nom est "
-"d�j� utilis�"
+msgid "unable to install package %s"
+msgstr "impossible d'installer le paquetage %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"impossible de prendre en compte la source ��%s�� car il n'existe aucun "
-"fichier-liste [%s]"
+msgid "unable to remove package %s"
+msgstr "impossible d'enlever le paquetage %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "impossible de d�terminer la source de ce fichier hdlist [%s]"
+msgid "Preparing..."
+msgstr "Pr�paration..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "impossible d'acc�der au fichier hdlist de ��%s��; source ignor�e"
+msgid "...retrieving failed: %s"
+msgstr "...�chec de la r�cup�ration�: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "impossible d'acc�der au fichier-liste de ��%s��; source ignor�e"
+msgid "...retrieving done"
+msgstr "...r�cup�ration effectu�e"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "tentative de d'ignorer la source existante ��%s��; abandon"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "r�cup�ration des fichiers rpm � partir de ��%s��..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "impossible de trouver le fichier hdlist pour ��%s��; source ignor�e"
+msgid "malformed input: [%s]"
+msgstr "entr�e incorrecte�: [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "impossible de trouver le fichier liste de ��%s��; source ignor�e"
+msgid "unable to access medium \"%s\""
+msgstr "impossible d'acc�der � la source ��%s��"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "fichier de liste incoh�rent pour ��%s��, source ignor�e"
+msgid "urpmi database locked"
+msgstr "base de donn�es urpmi v�rouill�e"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "impossible de consulter le fichier-liste pour ��%s��; source ignor�e"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"source incoh�rente ��%s�� marqu�e amovible mais qui ne l'est pas r�ellement"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "trop de points de montage pour la source amovible ��%s��"
+msgid "medium \"%s\" is not selected"
+msgstr "la source ��%s�� n'est pas s�lectionn�e"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "p�riph�rique de la source amovible pris sur ��%s��"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "impossible de lire le fichier rpm [%s] depuis la source ��%s��"
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "utilisation de diff�rents p�riph�riques amovibles [%s] pour ��%s��"
+msgid "package %s is not found."
+msgstr "paquetage %s non trouv�"
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "impossbile de d'acc�der au chemin de la source amovible ��%s��"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "Le m�dium ��%s�� ne d�finit aucun emplacement pour les fichiers rpm"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "impossible d'�crire le fichier de configuration [%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:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "�criture du fichier de configuration [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "il y a plusieurs paquetages avec le m�me nom de fichier ��%s��"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "impossible d'analyser ��%s�� dans le fichier [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "impossible d'analyser correctement [%s] pour la valeur ��%s��"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "examen du support distribu� dans le fichier [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Les paquetages suivants contiennent %s�: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "support distribu� trouv� pour les noeuds: %s"
+msgid "no package named %s"
+msgstr "pas de paquetage nomm� %s"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "utilisation du medium associ�e pour le mode parall�le�: %s"
+msgid "error registering local packages"
+msgstr "erreur lors de l'inscription des paquetages locaux"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "impossible d'acc�der au fichier rpm [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "impossible d'utiliser l'option distribu�e ��%s��"
+msgid "retrieving rpm file [%s] ..."
+msgstr "r�cup�ration des fichiers rpm [%s]..."
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr ""
-"--synthesis ne peut pas �tre utilis�e avec --media, --update ou --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "le nom du fichier rpm est invalide [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr "pas d'entr�e d�plac�e dans la depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "%s entr�es d�plac�es dans la depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "d�montage de %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "montage de %s"
 
-#: ../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 "removing %d obsolete headers in cache"
+msgstr "destruction de %d en-t�tes obsol�tes dans le cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "%d en-t�tes trouv� dans le cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "fichier de synth�se cr�� pour la source ��%s��"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "examen du fichier hdlist [%s]"
 
-#: ../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]"
 msgstr "examen de la liste de synth�se [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "probl�me de lecture du fichier hdlist sur la source ��%s��"
+msgid "building hdlist [%s]"
+msgstr "cr�ation de hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "lecture des en-t�tes de la source ��%s��"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "seconde �x�cution pour calculer les d�pendances\n"
 
-#: ../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\""
 msgstr "probl�me de lecture du fichier de synt�se de la source ��%s��"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "impossible d'ouvrir la base de donn�e rpm"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "la source ��%s�� existe d�j�"
+msgid "nothing written in list file for \"%s\""
+msgstr "rien n'a �t� �crit dans le fichier-liste pour ��%s��"
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "source %s ajout�e"
+msgid "writing list file for medium \"%s\""
+msgstr "Ecriture de la liste des fichiers pour le medium ��%s��"
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "impossible d'acc�der � la premi�re source d'installation"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "impossible d'�crire le fichier-liste ��%s��"
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "copie du fichier hdlists..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "le fichier [%s] est d�j� utilis� sur le m�me support ��%s��"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...copie effectu�e"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "impossible d'analyser le fichier hdlist de ��%s��"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...copie effectu�e"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "pas de fichier hdlist trouv� pour la source ��%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)"
-msgstr ""
-"impossible d'acc�der � la premi�re source d'installation (pas de fichier "
-"Mandrake/base/hdlists)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "la r�cup�ration du hdlist source (ou synth�se) a �chou�"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "r�cup�ration du fichier hdlists..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "examen du fichier de contr�le MD5SUM"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...r�cup�ration effectu�e"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "copie du hdlist source (ou synth�se) de ��%s��..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...�chec de la r�cup�ration�: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "r�cup�ration du hdlist source (ou synth�se) de ��%s��..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "description ��%s��  invalide dans le fichier des hdlists"
+msgid "retrieving description file of \"%s\"..."
+msgstr "r�cup�ration du fichier de description de ��%s��..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "essaye de s�lectionner une source inexistante ��%s��"
+msgid "no rpm files found from [%s]"
+msgstr "pas de fichier rpm trouv� pour [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "��%s��"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "impossible de lire les fichiers rpm � partir de [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "s�lection de plusieurs sources�: %s"
+msgid "reading rpm files from [%s]"
+msgstr "lecture des fichiers rpm � partir de [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "enlever la source ��%s��"
+msgid "...copying done"
+msgstr "...copie effectu�e"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "base de donn�es urpmi v�rouill�e"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...copie effectu�e"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "impossible d'acc�der � la source ��%s��"
+msgid "copying source list of \"%s\"..."
+msgstr "copie de la liste source de ��%s��..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copie du fichier description de ��%s��"
+msgid "copy of [%s] failed"
+msgstr "la copie de [%s] a �chou�"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copie du hdlist source (ou synth�se) de ��%s��..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "la copie de [%s] a �chou�"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "examen du fichier de contr�le MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "copie du fichier description de ��%s��"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "copie de la liste source de ��%s��..."
+msgid "removing medium \"%s\""
+msgstr "enlever la source ��%s��"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "lecture des fichiers rpm � partir de [%s]"
+msgid "selecting multiple media: %s"
+msgstr "s�lection de plusieurs sources�: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "impossible de lire les fichiers rpm � partir de [%s]: %s"
+msgid "\"%s\""
+msgstr "��%s��"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "pas de fichier rpm trouv� pour [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "essaye de s�lectionner une source inexistante ��%s��"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "r�cup�ration du fichier de description de ��%s��..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"impossible d'acc�der � la premi�re source d'installation (pas de fichier "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "r�cup�ration du hdlist source (ou synth�se) de ��%s��..."
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "la r�cup�ration du hdlist source (ou synth�se) a �chou�"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "description ��%s��  invalide dans le fichier des hdlists"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "pas de fichier hdlist trouv� pour la source ��%s��"
+msgid "retrieving hdlists file..."
+msgstr "r�cup�ration du fichier hdlists..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "le fichier [%s] est d�j� utilis� sur le m�me support ��%s��"
+msgid "copying hdlists file..."
+msgstr "copie du fichier hdlists..."
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "impossible d'analyser le fichier hdlist de ��%s��"
+msgid "unable to access first installation medium"
+msgstr "impossible d'acc�der � la premi�re source d'installation"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "impossible d'�crire le fichier-liste ��%s��"
+msgid "added medium %s"
+msgstr "source %s ajout�e"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "Ecriture de la liste des fichiers pour le medium ��%s��"
+msgid "medium \"%s\" already exists"
+msgstr "la source ��%s�� existe d�j�"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "rien n'a �t� �crit dans le fichier-liste pour ��%s��"
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "seconde �x�cution pour calculer les d�pendances\n"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "probl�me de lecture du fichier hdlist sur la source ��%s��"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "lecture des en-t�tes de la source ��%s��"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
+"--synthesis ne peut pas �tre utilis�e avec --media, --update ou --parallel"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "cr�ation de hdlist [%s]"
+msgid "unable to use parallel option \"%s\""
+msgstr "impossible d'utiliser l'option distribu�e ��%s��"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "fichier de synth�se cr�� pour la source ��%s��"
+msgid "using associated media for parallel mode: %s"
+msgstr "utilisation du medium associ�e pour le mode parall�le�: %s"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d en-t�tes trouv� dans le cache"
+msgid "found parallel handler for nodes: %s"
+msgstr "support distribu� trouv� pour les noeuds: %s"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "destruction de %d en-t�tes obsol�tes dans le cache"
+msgid "examining parallel handler in file [%s]"
+msgstr "examen du support distribu� dans le fichier [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "montage de %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "impossible d'analyser ��%s�� dans le fichier [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "d�montage de %s"
+msgid "write config file [%s]"
+msgstr "�criture du fichier de configuration [%s]"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s entr�es d�plac�es dans la depslist"
+msgid "unable to write config file [%s]"
+msgstr "impossible d'�crire le fichier de configuration [%s]"
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "pas d'entr�e d�plac�e dans la depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "impossbile de d'acc�der au chemin de la source amovible ��%s��"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "le nom du fichier rpm est invalide [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "utilisation de diff�rents p�riph�riques amovibles [%s] pour ��%s��"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "r�cup�ration des fichiers rpm [%s]..."
+msgid "taking removable device as \"%s\""
+msgstr "p�riph�rique de la source amovible pris sur ��%s��"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "impossible d'acc�der au fichier rpm [%s]"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "trop de points de montage pour la source amovible ��%s��"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "impossible d'acc�der au fichier rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "impossible de consulter le fichier-liste pour ��%s��; source ignor�e"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "erreur lors de l'inscription des paquetages locaux"
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "fichier de liste incoh�rent pour ��%s��, source ignor�e"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "pas de paquetage nomm� %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "impossible de trouver le fichier liste de ��%s��; source ignor�e"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Les paquetages suivants contiennent %s�: %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "impossible de trouver le fichier hdlist pour ��%s��; source ignor�e"
 
-#: ../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\""
-msgstr "il y a plusieurs paquetages avec le m�me nom de fichier ��%s��"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "tentative de d'ignorer la source existante ��%s��; abandon"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "impossible d'analyser correctement [%s] pour la valeur ��%s��"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "impossible d'acc�der au fichier-liste de ��%s��; source ignor�e"
 
-#: ../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)"
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "impossible d'acc�der au fichier hdlist de ��%s��; source ignor�e"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "Le m�dium ��%s�� ne d�finit aucun emplacement pour les fichiers rpm"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "impossible de d�terminer la source de ce fichier hdlist [%s]"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "paquetage %s non trouv�"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"impossible de prendre en compte la source ��%s�� car il n'existe aucun "
+"fichier-liste [%s]"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "la source ��%s�� n'est pas s�lectionn�e"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"impossible d'utiliser le nom ��%s�� pour la source non nomm�e car ce nom est "
+"d�j� utilis�"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "impossible de lire le fichier rpm [%s] depuis la source ��%s��"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"impossible de tenir compte de ��%s�� car la liste de fichiers est d�j� "
+"utilis�e par une autre source"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"source incoh�rente ��%s�� marqu�e amovible mais qui ne l'est pas r�ellement"
+"la source ��%s�� essaye d'utiliser une liste d�j� utilis�e, source ignor�e"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "entr�e incorrecte�: [%s]"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"la source ��%s�� essaye d'utiliser un hdlist d�j� utilis�, source ignor�e"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "r�cup�ration des fichiers rpm � partir de ��%s��..."
+msgid "syntax error in config file at line %s"
+msgstr "erreur de syntaxe dans le fichier de configuration � la ligne %s"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Pr�paration..."
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% compl�t�, vitesse = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "impossible d'enlever le paquetage %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% de %s compl�t�, ETA = %s, vitesse = %s"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "impossible d'installer le paquetage %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "�chec de rsync: sorti avec %d ou tu� par le signal %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s est n�cessaire � %s"
+msgid "ssh is missing\n"
+msgstr "ssh est manquant\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s est en conflit avec %s"
+msgid "rsync is missing\n"
+msgstr "rsync est manquant\n"
 
-#: ../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 a �chou�, le noeud est probablement inaccessible"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "�chec de curl�: sorti avec %d ou tu� par le signal %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 a �chou�, le noeud est probablement inaccessible"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl n'est pas install�\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "sur le noeud %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget a �chou�: sortie avec le code %d ou tu� par le signal %d\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 "L'installation a �chou� sur le noeud %s"
+msgid "wget is missing\n"
+msgstr "wget n'est pas install�\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 "L'installation est possible"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "echec de la copie: %s"
 
-#: ../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 "La commande scp a �chou� sur l'h�te %s"
+msgid "unable to handle protocol: %s"
+msgstr "impossible d'utiliser le protocole: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "l'h�te %s n'a pas une bonne version de urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "aucun programme de rapatriement de pages web (curl ou wget) trouv�\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 version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
-"licence GNU GPL\n"
-"\n"
-"usage:\n"
+msgid "unknown protocol defined for %s"
+msgstr "protocole inconnu d�fini pour %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         - afficher ce message d'aide\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Programme inconnu de rapatriement de pages web ��%s���!!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - s�lectionne automatiquement un paquetage parmi les choix\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Echec de la d�sinstallation"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - verifier si l'installation fonctionne correctement.\n"
+"Pour satisfaire les d�pendances, les paquetages suivants vont �tre "
+"d�sinstall�s (%d Mo)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi distribu� sur plusieurs machines d'alias.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "V�rification de d�sinstallation des paquetages suivants"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - s�lectionne toutes les paquetages correspondants � "
-"l'expression\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Rien � d�sinstaller"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: option ��-%s�� inconnue, v�rifiez l'usage avec --help\n"
+msgid "removing package %s will break your system"
+msgstr "La d�sinstallation du paquetage %s rendra votre syst�me instable"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "paquetage inconnu"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "paquetages inconnus"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "La d�sinstallation du paquetage %s rendra votre syst�me instable"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: option ��-%s�� inconnue, v�rifiez l'usage avec --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Rien � d�sinstaller"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - s�lectionne toutes les paquetages correspondants � "
+"l'expression\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "V�rification de d�sinstallation des paquetages suivants"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi distribu� sur plusieurs machines d'alias.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Pour satisfaire les d�pendances, les paquetages suivants vont �tre "
-"d�sinstall�s (%d Mo)"
+"  --test         - verifier si l'installation fonctionne correctement.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Echec de la d�sinstallation"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - s�lectionne automatiquement un paquetage parmi les choix\n"
 
-#: ../urpmf_.c:26
+#: ../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         - afficher ce message d'aide\n"
+
+#: ../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 ""
 "urpme version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
-"licence GNU GPL.\n"
+"licence GNU GPL\n"
 "\n"
 "usage:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - n'utilise que les sources de mise � jour.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"  --media        - utilise seulement les sources list�es (s�par�s par des\n"
-"                   virgules).\n"
+"  )              - parenth�se droite pour fermer un grouped'expression.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"  --synthesis    - utilise le fichier de synth�se donn� plut�t que la base\n"
-"                   de donn�es urpmi.\n"
+"  (              - parenth�se gauche pour ouvrir un grouped'expression.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - mode verbeux.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - NON unaire, vrai si l'expression est fausse.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet        - ne pas afficher le nom des champs (actif par d�faut si "
-"aucun champ)\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - afficher tous les champs.\n"
+"  -o             - op�rateur binaire OU, vrai si une expression est vraie.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name         - affiche le champ ��name���: nom du fichier rpm\n"
-"                   (par d�faut si aucun champ).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - afficher le champ ��group���: groupe.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - afficher le champ ��size���: taille.\n"
+"  -a             - op�rateur binaire ET, vrai si les deux espressions sont\n"
+"                   vraies.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - afficher le champ ��epoch���: s�rie.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inclure du code perl directement.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - afficher le champ ��summary���: r�sum�.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - affiche la version, la release et l'architecture\n"
+"                   du paquetage avec le nom\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - afficher le champ ��description���: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignorer la distinction de case.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - afficher le champ ��provides���: tous les apports (multi-"
-"lignes).\n"
+"  --obsoletes     - afficher le champ ��obsoletes���: toutes les "
+"obsolescences (multi-lignes).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - afficher le champ ��requires���: toutes les d�pendances "
+"  --conflicts     - afficher le champ ��conflicts���: tous les conflits "
 "(multi-lignes).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 "  --files         - afficher le champ ��files���: tous les fichiers (multi-"
 "lignes).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - afficher le champ ��conflicts���: tous les conflits "
+"  --requires      - afficher le champ ��requires���: toutes les d�pendances "
 "(multi-lignes).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - afficher le champ ��obsoletes���: toutes les "
-"obsolescences (multi-lignes).\n"
+"  --provides      - afficher le champ ��provides���: tous les apports (multi-"
+"lignes).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignorer la distinction de case.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - afficher le champ ��description���: description.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - affiche la version, la release et l'architecture\n"
-"                   du paquetage avec le nom\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - afficher le champ ��summary���: r�sum�.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inclure du code perl directement.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - afficher le champ ��epoch���: s�rie.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - afficher le champ ��size���: taille.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - afficher le champ ��group���: groupe.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - op�rateur binaire ET, vrai si les deux espressions sont\n"
-"                   vraies.\n"
+"  --name         - affiche le champ ��name���: nom du fichier rpm\n"
+"                   (par d�faut si aucun champ).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - afficher tous les champs.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - op�rateur binaire OU, vrai si une expression est vraie.\n"
+"  --quiet        - ne pas afficher le nom des champs (actif par d�faut si "
+"aucun champ)\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - NON unaire, vrai si l'expression est fausse.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - mode verbeux.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  (              - parenth�se gauche pour ouvrir un grouped'expression.\n"
+"  --synthesis    - utilise le fichier de synth�se donn� plut�t que la base\n"
+"                   de donn�es urpmi.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  )              - parenth�se droite pour fermer un grouped'expression.\n"
+"  --media        - utilise seulement les sources list�es (s�par�s par des\n"
+"                   virgules).\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - n'utilise que les sources de mise � jour.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"Utilisation: urpmi.addmedia [options] <nom> <url> [with <chemin relatif>]\n"
-"o� <url> est l'un de�:\n"
-"       file://<chemin>\n"
-"       ftp://<utilisateur>:<mot de passe>@<h�te>/<chemin> with <nom de "
-"fichier relatif de hdlist>\n"
-"       ftp://<h�te>/<chemin> with <nom de fichier relatif de hdlist>\n"
-"       http://<host>/<path> with <nom de fichier relatif de hdlist>\n"
-"       removable://<chemin>\n"
+"urpme version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
+"licence GNU GPL.\n"
 "\n"
-"et [options] sont issues de\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         - utiliser wget pour r�cup�rer les fichiers distants.\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         - utilise curl pour r�cup�rer les fichiers distants.\n"
+"usage:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limite la vitesse de t�l�chargement.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "tout est d�j� install�"
 
-#: ../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        - utilise le proxy HTTP indiqu�, le n� de port \n"
-"                   �tant 1080 � d�faut d'indication (format <proxy[:port]"
-">).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "L'installation est possible"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - sp�cifie l'utilisateur et le mot de passe pour \n"
-"                   l'authentification  proxy (format <utilisateur:"
-"motdepasse>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "L'installation a �chou�"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - cr�e une source de mise � jour.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Essayer de forcer l'installation (--force)�? (o/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - cr�e automatiquement toutes les media sources � partir \n"
-"                    d'une source d'installation.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Essayer d'installer sans v�rifier les d�pendances�? (o/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  - cr�e automatiquement un medium pour XXX appartenant � "
-"une\n"
-"       distribution, XXX peut-�tre main (principal), contrib "
-"(contributions), updates \n"
-"       (mises-�-jour) ou n'importe quoi d'autre qui a �t� configur� ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distribution de %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --env          - utilise l'url sp�cifi� pour une liste de miroirs, par "
-"d�faut\n"
-"                   %s\n"
+"L'installation a �chou�, il manque des fichiers:\n"
+"%s\n"
+"Vous devriez mettre � jour votre base de donn�es urpmi"
 
-#: ../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"
-msgstr ""
-"  --version      - utilise la version sp�cifi�e, celle par d�faut est\n"
-"                   celle du paquetage install� par la distribution "
-"mandrake.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (o/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - utilise l'architecture sp�cifi�e, par d�faut celle "
-"install�e par\n"
-"                   la distribution mandrake.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Voulez-vous continuer l'installation�?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - purger le r�pertoire cache des en-t�tes.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Les paquetages suivants ont des signatures non valides"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - essaye de trouver et d'utiliser le fichier \n"
-"                  hdlist ou de synth�se.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Appuyez sur la touche Entr�e quand vous �tes pr�ts..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forcer la g�n�ration des fichiers hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Veuillez ins�rer le medium nomm� ��%s�� dans le p�riph�rique [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
-"Ne peut ajouter des mises-�-jour sur une distribution "
-"��cooker�� (��betas��)\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "impossible de r�cup�rer les paquetages sources, abandon"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"inutile de sp�cifier  le <chemin relatif de hdlist> avec --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "impossible de mettre � jour la source ��%s��\n"
+"Pour satisfaire les d�pendances, les paquetages suivants vont �tre install�s "
+"(%d Mo)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Vous devez �tre root pour installer les d�pendances suivantes:\n"
 "%s\n"
-"<chemin relatif de hdlist> manquant\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 ""
+"Afin de poursuivre la mise-�-jour, les paquetages suivants doivent �tre "
+"d�sinstall�s:\n"
 "%s\n"
-"directive ��with�� manquante pour la source ftp\n"
+"Etes-vous d'accord?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "impossible de cr�er la source ��%s��\n"
+msgid "unrequested"
+msgstr "non demand�"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"Utilisation: urpmi.removemedia [-a] <nom> ...\n"
-"o� <nom> est une source � retirer.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "%s est en conflit"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - s�lectionne toutes les sources\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "%s absent"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"option inconnue '%s'\n"
+msgid "due to unsatisfied %s"
+msgstr "%s non satisfait"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "rien � retirer (utiliser urpmi.addmedia  pour ajouter une source)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "pour installer le paquetage %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 ""
-"L'entr�e � retirer est manquante\n"
-" (l'une parmi %s)\n"
+"Certains paquetages demand�s n'ont pu �tre install�s\n"
+"%s\n"
+"Etes vous d'accord�?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"Utillisation: urpmi.update [options] <nom> ...\n"
-"o� <nom> est une source � mettre � jour.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "D�sol�, mauvais choix, veuillez r�essayez\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - ne rafra�chit que les sources de mise � jour.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Que choisissez-vous�? (1-%d)"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - s�lectionne toute les sources non amovibles\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Un des paquetages suivants est n�cessaire�:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - force le calcul complet du fichier depslist.ordered\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "L'un des paquetages suivants est n�cessaire pour installer %s�:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"rien � mettre � jour (utiliser urpmi.addmedia pour ajouter une source)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Seul l'administrateur syst�me (root) peut installer des paquetages"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"l'entr�e � mettre � jour est manquante\n"
-"(un parmi de %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "avec environnement sp�cifique sur %s\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 "impossible de cr�er le r�pertoire [%s] pour le rapport de bogue"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
-"licence GNU GPL\n"
-"\n"
-"usage:\n"
+"Ce qui peut-�tre fait avec les fichiers binaires rpm avec l'option --install-"
+"src"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: option \"-%s\" inconnue, v�rifiez l'usage avec --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  --synthesis    - utilise le fichier de synth�se donn� plut�t que la base\n"
-"                   de donn�es urpmi.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --auto-select  - s�lectionne automatiquement les paquetages de mise-�-"
-"jour.\n"
+"  les noms ou les fichiers rpm donn�s en ligne de commande seront "
+"install�s.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - impose la recherche floue (identique � -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode verbeux.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - le prochain paquetage est un paquetage source\n"
-"                   (identique � -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode peu verbeux.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --install-src  - n'installe que les paquetages-source (pas les binaires).\n"
+"  -s             - le prochain paquetage est un paquetage source (identique "
+"�\n"
+"                   --src).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impose la recherche floue (identique � --fuzzy).\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
-"  --clean        - enlever tous les rpm du cache avant toute op�ration.\n"
+"  -P             - ne pas chercher dans les apports pour trouver un "
+"paquetage.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - garder les rpm non utilis�s dans le cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - cherche dans les apports pour trouver le paquetage.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --force        - forcer l'invocation m�me si certains paquetages "
-"n'existent\n"
-"                   pas.\n"
+"  -a             - s�lectionne toutes les correspondances de la ligne de\n"
+"                   commande.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
-"  --allow-nodeps - permet � l'utilisateur qui le demande d'installer\n"
-"                   des paquetages sans v�rifier les d�pendances.\n"
+"  --excludepath  - exclure les chemins indiqu�s, s�par�s par des virgules.\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  - autorise l'utilisateur qui le demande � installer les\n"
-"                   paquetages sans v�rifier les d�pendances et l'int�grit�.\n"
+"  --verify-rpm   - verifie la signature du rpm avant l'installation.\n"
+"                   (--no-verify-rpm d�sactive la v�rification).\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          - d�livre un rapport de bogue dans le r�pertoire\n"
-"                   indiqu� en second argument.\n"
+"  --best-output  - choisit la meilleure interface en fonction de\n"
+"                   l'environnement: mode graphique ou textuel.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - utiliser l'interface graphique (X11)\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1193,473 +1322,511 @@ msgstr ""
 "  --env          - utilise un environment sp�cifique (en g�n�ral\n"
 "                   un rapport de bogue).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - utiliser l'interface graphique (X11)\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  - choisit la meilleure interface en fonction de\n"
-"                   l'environnement: mode graphique ou textuel.\n"
+"  --bug          - d�livre un rapport de bogue dans le r�pertoire\n"
+"                   indiqu� en second argument.\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   - verifie la signature du rpm avant l'installation.\n"
-"                   (--no-verify-rpm d�sactive la v�rification).\n"
+"  --proxy-user   - sp�cifie l'utilisateur et le mot de passe pour \n"
+"                   l'authentification  proxy (format <utilisateur:"
+"motdepasse>).\n"
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\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 ""
-"  --excludepath  - exclure les chemins indiqu�s, s�par�s par des virgules.\n"
+"  --proxy        - utilise le proxy HTTP indiqu�, le n� de port \n"
+"                   �tant 1080 � d�faut d'indication (format <proxy[:port]"
+">).\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - s�lectionne toutes les correspondances de la ligne de\n"
-"                   commande.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limite la vitesse de t�l�chargement.\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"  -p             - cherche dans les apports pour trouver le paquetage.\n"
+"  --curl         - utilise curl pour r�cup�rer les fichiers distants.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"  -P             - ne pas chercher dans les apports pour trouver un "
-"paquetage.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impose la recherche floue (identique � --fuzzy).\n"
+"  --wget         - utiliser wget pour r�cup�rer les fichiers distants.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -s             - le prochain paquetage est un paquetage source (identique "
-"�\n"
-"                   --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mode peu verbeux.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode verbeux.\n"
+"  --allow-force  - autorise l'utilisateur qui le demande � installer les\n"
+"                   paquetages sans v�rifier les d�pendances et l'int�grit�.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  les noms ou les fichiers rpm donn�s en ligne de commande seront "
-"install�s.\n"
+"  --allow-nodeps - permet � l'utilisateur qui le demande d'installer\n"
+"                   des paquetages sans v�rifier les d�pendances.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: option \"-%s\" inconnue, v�rifiez l'usage avec --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"Ce qui peut-�tre fait avec les fichiers binaires rpm avec l'option --install-"
-"src"
+"  --force        - forcer l'invocation m�me si certains paquetages "
+"n'existent\n"
+"                   pas.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "impossible de cr�er le r�pertoire [%s] pour le rapport de bogue"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - garder les rpm non utilis�s dans le cache.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "avec environnement sp�cifique sur %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Seul l'administrateur syst�me (root) peut installer des paquetages"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - enlever tous les rpm du cache avant toute op�ration.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "L'un des paquetages suivants est n�cessaire pour installer %s�:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Un des paquetages suivants est n�cessaire�:"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - n'installe que les paquetages-source (pas les binaires).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Que choisissez-vous�? (1-%d)"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - le prochain paquetage est un paquetage source\n"
+"                   (identique � -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "D�sol�, mauvais choix, veuillez r�essayez\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - impose la recherche floue (identique � -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Certains paquetages demand�s n'ont pu �tre install�s\n"
-"%s\n"
-"Etes vous d'accord�?"
+"  --auto-select  - s�lectionne automatiquement les paquetages de mise-�-"
+"jour.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "pour installer le paquetage %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utilise le fichier de synth�se donn� plut�t que la base\n"
+"                   de donn�es urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s non satisfait"
+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 version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
+"licence GNU GPL\n"
+"\n"
+"usage:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "%s absent"
+msgid "unable to update medium \"%s\"\n"
+msgstr "impossible de mettre � jour la source ��%s��\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "%s est en conflit"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "non demand�"
+msgid "unable to create medium \"%s\"\n"
+msgstr "impossible de cr�er la source ��%s��\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 ""
-"Afin de poursuivre la mise-�-jour, les paquetages suivants doivent �tre "
-"d�sinstall�s:\n"
 "%s\n"
-"Etes-vous d'accord?"
+"directive ��with�� manquante pour la source ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Pour satisfaire les d�pendances, les paquetages suivants vont �tre install�s "
-"(%d Mo)"
+"%s\n"
+"<chemin relatif de hdlist> manquant\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 ""
-"Vous devez �tre root pour installer les d�pendances suivantes:\n"
 "%s\n"
+"inutile de sp�cifier  le <chemin relatif de hdlist> avec --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "impossible de r�cup�rer les paquetages sources, abandon"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "r�cup�ration des fichiers rpm [%s]..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% de %s compl�t�, ETA = %s, vitesse = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr ""
+"Ne peut ajouter des mises-�-jour sur une distribution "
+"��cooker�� (��betas��)\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% compl�t�, vitesse = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"option inconnue '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Veuillez ins�rer le medium nomm� ��%s�� dans le p�riph�rique [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Appuyez sur la touche Entr�e quand vous �tes pr�ts..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Les paquetages suivants ont des signatures non valides"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Voulez-vous continuer l'installation�?"
-
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (o/N) "
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forcer la g�n�ration des fichiers hdlist.\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"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
-"L'installation a �chou�, il manque des fichiers:\n"
-"%s\n"
-"Vous devriez mettre � jour votre base de donn�es urpmi"
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "L'installation a �chou�"
+"  -h             - essaye de trouver et d'utiliser le fichier \n"
+"                  hdlist ou de synth�se.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distribution de %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Essayer d'installer sans v�rifier les d�pendances�? (o/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Essayer de forcer l'installation (--force)�? (o/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "tout est d�j� install�"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - purger le r�pertoire cache des en-t�tes.\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"
-"\n"
-"usage:\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
-"licence GNU GPL.\n"
-"\n"
-"usage:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - montrer tous les paquetages disponibles.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - montrer toutes les sources disponibles.\n"
+"  --arch         - utilise l'architecture sp�cifi�e, par d�faut celle "
+"install�e par\n"
+"                   la distribution mandrake.\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../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 ""
-"  --list-nodes   - montrer tous les noeuds disponibles en.\n"
-"                   utilisant --parallel.\n"
-
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - liste les images parall�les disponibles.\n"
+"  --version      - utilise la version sp�cifi�e, celle par d�faut est\n"
+"                   celle du paquetage install� par la distribution "
+"mandrake.\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  --headers      - extrait les en-t�tes des paquetages list�s de la base "
-"urpmi\n"
-"                   vers la sortie standard (root seulement).\n"
+"  --env          - utilise l'url sp�cifi� pour une liste de miroirs, par "
+"d�faut\n"
+"                   %s\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --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 ""
-"  --sources      - donner tous les paquetages sources avant de t�l�charger.\n"
-"                   (root seulement).\n"
-
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - �tend la requ�te aux d�pendances du paquetage.\n"
+"  --distrib-XXX  - cr�e automatiquement un medium pour XXX appartenant � "
+"une\n"
+"       distribution, XXX peut-�tre main (principal), contrib "
+"(contributions), updates \n"
+"       (mises-�-jour) ou n'importe quoi d'autre qui a �t� configur� ;-)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"  -u             - enl�ve le paquetage si une version plus r�cente est d�j�\n"
-"                   install�e.\n"
+"  --distrib      - cr�e automatiquement toutes les media sources � partir \n"
+"                    d'une source d'installation.\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr ""
-"  -c              - sortie sur la ligne de commande avec les\n"
-"                    noms des paquetages � d�sinstaller.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - cr�e une source de mise � jour.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
 msgstr ""
-"  -R             - recherche invers�e des items n�cessitant ce paquetage.\n"
-
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - afficher les groupes ainsi que les noms\n"
-
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - affiche la version d�taill�e ainsi que le nom.\n"
+"Utilisation: urpmi.addmedia [options] <nom> <url> [with <chemin relatif>]\n"
+"o� <url> est l'un de�:\n"
+"       file://<chemin>\n"
+"       ftp://<utilisateur>:<mot de passe>@<h�te>/<chemin> with <nom de "
+"fichier relatif de hdlist>\n"
+"       ftp://<h�te>/<chemin> with <nom de fichier relatif de hdlist>\n"
+"       http://<host>/<path> with <nom de fichier relatif de hdlist>\n"
+"       removable://<chemin>\n"
+"\n"
+"et [options] sont issues de\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  les noms ou fichiers rpms indiqu� sur la ligne de commandes sont "
-"int�rrog�s.\n"
+"L'entr�e � retirer est manquante\n"
+" (l'une parmi %s)\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes peut seulement �tre utilis� avec --parallel"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "rien � retirer (utiliser urpmi.addmedia  pour ajouter une source)\n"
 
-#: placeholder.h:18
+#: ../urpmi.removemedia:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "version urpmf %s"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - s�lectionne toutes les sources\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"Utilisation: urpmi.removemedia [-a] <nom> ...\n"
+"o� <nom> est une source � retirer.\n"
 
-#: placeholder.h:20
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
-"licence GNU GPL."
+"l'entr�e � mettre � jour est manquante\n"
+"(un parmi de %s)\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "utilisation: urpmf [options] <fichier>"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"rien � mettre � jour (utiliser urpmi.addmedia pour ajouter une source)\n"
 
-#: placeholder.h:22
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"   --quiet        - ne pas afficher le nom des champs (actif par d�faut si "
-"aucun champ "
+"  -d             - force le calcul complet du fichier depslist.ordered\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr ""
-"                   sur la ligne de commande, incompatible avec le mode "
-"interactif)."
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - s�lectionne toute les sources non amovibles\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - afficher tous les champs"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - ne rafra�chit que les sources de mise � jour.\n"
 
-#: placeholder.h:25
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  --name       - affiche le champ ��name���: nom du fichier rpm (par d�faut "
-"si aucun champ"
+"Utillisation: urpmi.update [options] <nom> ...\n"
+"o� <nom> est une source � mettre � jour.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr ""
-"                    sur la ligne de commande mais sans nom de paquetage)"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes peut seulement �tre utilis� avec --parallel"
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - afficher le champ ��group���: groupe"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - afficher le champ ��size���: taille."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: option ��-%s�� inconnue, v�rifiez l'usage avec --help\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - afficher le champ ��serial���: num�ro de s�rie."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+"  les noms ou fichiers rpms indiqu� sur la ligne de commandes sont "
+"int�rrog�s.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - afficher le champ ��summary���: r�sum�."
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - affiche la version d�taill�e ainsi que le nom.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - afficher le champ ��description���: description."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - afficher les groupes ainsi que les noms\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"  --provides      - afficher le champ ��provides���: tous les apports (multi-"
-"lignes)."
+"  -R             - recherche invers�e des items n�cessitant ce paquetage.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
-"  --requires      - afficher le champ ��requires���: toutes les d�pendances "
-"(multi-lignes)."
+"  -c              - sortie sur la ligne de commande avec les\n"
+"                    noms des paquetages � d�sinstaller.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --files         - afficher le champ ��files���: tous les fichiers (multi-"
-"lignes)."
+"  -u             - enl�ve le paquetage si une version plus r�cente est d�j�\n"
+"                   install�e.\n"
 
-# �
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - �tend la requ�te aux d�pendances du paquetage.\n"
+
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - afficher le champ ��conflicts���: tous les conflits "
-"(multi-lignes)."
+"  --sources      - donner tous les paquetages sources avant de t�l�charger.\n"
+"                   (root seulement).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletes     - afficher le champ ��obsoletes���: toutes les "
-"obsolescences (multi-lignes)."
+"  --headers      - extrait les en-t�tes des paquetages list�s de la base "
+"urpmi\n"
+"                   vers la sortie standard (root seulement).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - liste les images parall�les disponibles.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --prereqs       - afficher le tag ��prereqs���: toutes les d�pendances "
-"pr�liminaires(multi-lignes)."
+"  --list-nodes   - montrer tous les noeuds disponibles en.\n"
+"                   utilisant --parallel.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "essayez ��urpmf --help�� pour plus d'options"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - montrer toutes les sources disponibles.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "aucune liste de source compl�te n'a pu �tre trouv�e"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - montrer tous les paquetages disponibles.\n"
+
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
+"licence GNU GPL.\n"
+"\n"
+"usage:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "�chec de curl�: sorti avec %d ou tu� par le signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "L'installation a �chou� sur le noeud %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync est manquant\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp a �chou�, le noeud est probablement inaccessible"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "�chec de rsync: sorti avec %d ou tu� par le signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput a �chou�, le noeud est probablement inaccessible"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh est manquant\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "sur le noeud %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "erreur de syntaxe dans le fichier de configuration � la ligne %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "La commande scp a �chou� sur l'h�te %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "la source ��%s�� essaye d'utiliser un hdlist d�j� utilis�, source ignor�e"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "l'h�te %s n'a pas une bonne version de urpmi"
diff --git a/po/ga.po b/po/ga.po
index f8bf39c0..8bb1b244 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.5\n"
-"POT-Creation-Date: 2003-03-05 19:38+0100\n"
+"POT-Creation-Date: 2003-03-05 21:19+0100\n"
 "PO-Revision-Date: 2000-04-06 10:25+0100\n"
 "Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
 "Language-Team: Gaeilge <ga@li.org>\n"
@@ -13,1432 +13,1606 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "ag feisti� %s\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 "TtYy"
 
-#: ../_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 "Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmg leagan %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Co�pcheart (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 ""
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "An bhfuil sin Ok ?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "�s�id: urpmf [rogha�] <comhad>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ceart go Leor"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Cealaigh"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_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 "TtYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (T/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: ../urpm.pm_.c:226
-#, c-format
-msgid "unable to handle protocol: %s"
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "Theip ar feisti�"
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:288
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
 msgstr ""
 
-#: ../urpm.pm_.c:556
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr ""
+
+#: ../_irpm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpm.pm_.c:572
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid " (Y/n) "
+msgstr " (T/n) "
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ceart go Leor"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "An bhfuil sin Ok ?"
+
+#: ../_irpm:1
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
 
-#: ../urpm.pm_.c:578
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "installing %s\n"
+msgstr "ag feisti� %s\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm_.c:585
-#, fuzzy, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "T� droch ainmchomad rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:589
-#, fuzzy, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "T� droch ainmchomad rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid "%s is needed by %s"
 msgstr ""
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpm.pm_.c:622
-#, fuzzy, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "l�amh depslist comhad [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "Preparing..."
+msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "...retrieving failed: %s"
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, c-format
+msgid "...retrieving done"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm_.c:716
-#, fuzzy, c-format
-msgid "unable to write config file [%s]"
-msgstr "T� droch ainmchomad rpm [%s]"
-
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "write config file [%s]"
-msgstr "l�amh depslist comhad [%s]"
-
-#: ../urpm.pm_.c:755
-#, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm_.c:766
-#, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "l�amh depslist comhad [%s]"
-
-#: ../urpm.pm_.c:776
-#, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "l�amh depslist comhad [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
+msgstr ""
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%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:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../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
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "l�amh depslist comhad [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../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
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "l�amh depslist comhad [%s]"
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no package named %s"
+msgstr "pac�iste ar bith den ainm %s"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "l�amh depslist comhad [%s]"
+msgid "unable to register rpm file"
+msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "retrieving rpm file [%s] ..."
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unmounting %s"
+msgstr "ag feisti� %s"
 
-#: ../urpm.pm_.c:937
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "l�amh depslist comhad [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "ag feisti� %s"
 
-#: ../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 "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "Theip ar feisti�"
-
-#: ../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 "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../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"
+msgid "examining synthesis file [%s]"
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:975
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "building hdlist [%s]"
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "reading headers from medium \"%s\""
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "selecting multiple media: %s"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
+msgid "nothing written in list file for \"%s\""
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "T� droch ainmchomad rpm [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "l�amh depslist comhad [%s]"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "no hdlist file found for medium \"%s\""
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "T�ip c�ip do [%s]"
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr ""
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
+#: ../urpm.pm:1
+#, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "T� droch ainmchomad rpm [%s]"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "T� droch ainmchomad rpm [%s]"
+msgid "retrieving description file of \"%s\"..."
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "no rpm files found from [%s]"
 msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "l�amh depslist comhad [%s]"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "l�amh depslist comhad [%s]"
+msgid "reading rpm files from [%s]"
+msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, c-format
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "...copying failed"
+msgstr "Theip ar feisti�"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr ""
-
-#: ../urpm.pm_.c:1480
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "T� droch ainmchomad rpm [%s]"
+msgid "copy of [%s] failed"
+msgstr "T�ip c�ip do [%s]"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "T� droch ainmchomad rpm [%s]"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
+msgid "copying description file of \"%s\"..."
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "removing medium \"%s\""
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "selecting multiple media: %s"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
+#, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "building hdlist [%s]"
+msgid "retrieving hdlists file..."
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "copying hdlists file..."
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "ag feisti� %s"
+msgid "medium \"%s\" already exists"
+msgstr ""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "ag feisti� %s"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "using associated media for parallel mode: %s"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "l�amh depslist comhad [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "l�amh depslist comhad [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "write config file [%s]"
 msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to write config file [%s]"
+msgstr "T� droch ainmchomad rpm [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "T� droch ainmchomad rpm [%s]"
-
-#: ../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
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "pac�iste ar bith den ainm %s"
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "too many mount points for removable medium \"%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 "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "T� droch ainmchomad rpm [%s]"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:2171
-#, c-format
-msgid ""
-"medium \"%s\" use an invalid list file (mirror is problably not up-to-date, "
-"trying to use alternate method)"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "l�amh depslist comhad [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
+msgid "unable to access list file of \"%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 "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "T� droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "T� droch ainmchomad rpm [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "l�amh depslist comhad [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "syntax error in config file at line %s"
+msgstr "T� droch ainmchomad rpm [%s]"
+
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to remove package %s"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to install package %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "ssh is missing\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Theip ar feisti�"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "Theip ar feisti�"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr ""
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
+msgid "copy failed: %s"
 msgstr "Theip ar feisti�"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../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"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpme:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "T� ceann de na pac�ist� seo de dh�th:"
+
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "pac�iste ar bith den ainm %s"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "pac�iste ar bith den ainm %s"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "T� ceann de na pac�ist� seo de dh�th:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme_.c:113
-msgid "Removing failed"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../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 ""
 
-#: ../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_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr ""
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "t� gach rud ann cheana f�in"
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Theip ar feisti�"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Theip ag feisti�"
 
-#: ../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"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "ag feisti� %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../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 ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (T/n) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "T� %s ins na pac�ist� a leanas: %s \n"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Br� Enter nuair at� sin d�anta agat..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"do you agree ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr "�s�id: urpmi.removemedia [-a] <ainm>..."
-
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Droch-rogha, athtrialaigh!\n"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "C�ard � do rogha? (1-%d) "
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "T� ceann de na pac�ist� seo de dh�th:"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "T� ceann de na pac�ist� seo de dh�th:"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../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 "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:86
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:100
+#: ../urpmi:1
+#, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:103
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\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 ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../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 "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:349
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "T� ceann de na pac�ist� seo de dh�th:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "T� ceann de na pac�ist� seo de dh�th:"
-
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "C�ard � do rogha? (1-%d) "
-
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Droch-rogha, athtrialaigh!\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
+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_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr ""
-
-#: ../urpmi_.c:416
-msgid "unrequested"
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "l�amh depslist comhad [%s]"
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Br� Enter nuair at� sin d�anta agat..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "T� %s ins na pac�ist� a leanas: %s \n"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (T/n) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr ""
 
-#: ../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 ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Theip ag feisti�"
+#: ../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 ""
 
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "ag feisti� %s\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../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 ""
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "t� gach rud ann cheana f�in"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: ../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"
-msgstr ""
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, fuzzy, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr "�s�id: urpmi.removemedia [-a] <ainm>..."
 
-#: ../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 ""
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmg leagan %s"
-
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Co�pcheart (C) 1999,2000,2001,2002 Mandrakesoft."
-
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "�s�id: urpmf [rogha�] <comhad>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Theip ar feisti�"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr ""
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Theip ar feisti�"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
 #~ msgid "Is it ok?"
diff --git a/po/gl.po b/po/gl.po
index 65de406d..7d1b415e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,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: 2000-05-09 23:50+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -14,661 +14,728 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instalando %s\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 "SsYy"
 
-#: ../_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 "Nn"
+
+#: placeholder.h:18
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "urpmf version %s"
 msgstr ""
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "�Est� ben?"
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr ""
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Aceptar"
+#: placeholder.h:20
+msgid ""
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
+msgstr ""
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Cancelar"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr ""
 
-#: ../_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 "Nn"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_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 "SsYy"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (S/n) "
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
 msgstr ""
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: ../urpm.pm_.c:226
-#, c-format
-msgid "unable to handle protocol: %s"
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "A instalaci�n fallou"
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr ""
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: ../urpm.pm_.c:288
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:556
-#, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:572
-#, c-format
+#: placeholder.h:35
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:578
-#, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:585
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:589
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
 msgstr ""
 
-#: ../urpm.pm_.c:598
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: placeholder.h:40
+msgid "no full media list was found"
 msgstr ""
 
-#: ../urpm.pm_.c:600
+#: ../_irpm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpm.pm_.c:614
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpm.pm_.c:622
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../urpm.pm_.c:628
-#, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Aceptar"
 
-#: ../urpm.pm_.c:651
-#, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "�Est� ben?"
 
-#: ../urpm.pm_.c:659
+#: ../_irpm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "installing %s\n"
+msgstr "instalando %s\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "%s is needed by %s"
 msgstr ""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "unable to install package %s"
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "write config file [%s]"
+msgid "unable to remove package %s"
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm_.c:766
-#, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr ""
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
+msgid "unable to access medium \"%s\""
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "urpmi database locked"
+msgstr "a petici�n � base de datos rpm fallou\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 "incoherent medium \"%s\" marked removable but not really"
 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 "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
-
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
-#, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %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:933
-msgid "unable to access first installation medium"
+#: ../urpm.pm:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr ""
+#: ../urpm.pm:1 ../urpme:1
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes paquetes conte�en %s: %s\n"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "A instalaci�n fallou"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "non hai ning�n paquete co nome %s\n"
 
-#: ../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 "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
-
-#: ../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 "unable to register rpm file"
 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"
+msgid "retrieving rpm file [%s] ..."
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:975
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
-
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "invalid rpm file name [%s]"
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
-
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-#, fuzzy
-msgid "urpmi database locked"
-msgstr "a petici�n � base de datos rpm fallou\n"
+msgid "unmounting %s"
+msgstr "instalando %s\n"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
+msgid "mounting %s"
+msgstr "instalando %s\n"
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy of [%s] failed"
-msgstr "A instalaci�n fallou"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
+#: ../urpm.pm:1
+#, c-format
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1248
-#, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
-
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "nothing written in list file for \"%s\""
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "unable to write list file of \"%s\""
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr ""
-
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
+msgid "retrieving description file of \"%s\"..."
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
+msgid "no rpm files found from [%s]"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "reading rpm files from [%s]"
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "A instalaci�n fallou"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "mounting %s"
-msgstr "instalando %s\n"
+msgid "copy of [%s] failed"
+msgstr "A instalaci�n fallou"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
+#, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "instalando %s\n"
+msgid "removing medium \"%s\""
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
+msgid "trying to select inexistent medium \"%s\""
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
+#, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "retrieving hdlists file..."
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm_.c:1865
-msgid "unable to register rpm file"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
+#: ../urpm.pm:1
+#, c-format
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1960
-#, fuzzy, c-format
-msgid "no package named %s"
-msgstr "non hai ning�n paquete co nome %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" already exists"
+msgstr ""
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes paquetes conte�en %s: %s\n"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../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 "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "unable to use parallel option \"%s\""
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../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 "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
+msgid "examining parallel handler in file [%s]"
 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 "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "write config file [%s]"
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to write config file [%s]"
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to remove package %s"
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to install package %s"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "A instalaci�n fallou"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "A instalaci�n fallou"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: ../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:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "A instalaci�n fallou"
+msgid "syntax error in config file at line %s"
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpme_.c:39
+#: ../urpm.pm:1 ../urpmi: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"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../urpme_.c:64
+#: ../urpm.pm:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpme_.c:83
-#, fuzzy
-msgid "unknown package"
-msgstr "non hai ning�n paquete co nome %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr ""
 
-#: ../urpme_.c:83
-#, fuzzy
-msgid "unknown packages"
-msgstr "non hai ning�n paquete co nome %s\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "A instalaci�n fallou"
 
-#: ../urpme_.c:93
+#: ../urpm.pm:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Neces�tase un dos seguintes paquetes:"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr ""
 
-#: ../urpme_.c:105
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr ""
+
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr ""
+
+#: ../urpme:1
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be removed (%d "
@@ -677,771 +744,880 @@ msgstr ""
 "Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
 "d MB)"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Neces�tase un dos seguintes paquetes:"
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, c-format
-msgid ""
-"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"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "non hai ning�n paquete co nome %s\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "non hai ning�n paquete co nome %s\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpme:1
+#, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpmf_.c:36
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpmf_.c:39
+#: ../urpme:1 ../urpmi:1
+#, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
-msgstr ""
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\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 ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpme: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 ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
+#: ../urpmf:1 ../urpmq:1
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:115
+#: ../urpmf:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../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 "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:57 ../urpmi.update_.c:66 ../urpmi_.c:92 ../urpmq_.c:58
+#: ../urpmf: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"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../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"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../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 "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:72
+#: ../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 ""
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "xa est� todo instalado"
+
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "A instalaci�n fallou"
+
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "A instalaci�n fallou"
+
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "�Probar a instalaci�n con menos comprobaci�ns (--force)? (s/N) "
+
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "�Probar a instalaci�n sen comprobar as dependencias? (s/N) "
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "instalando %s\n"
 
-#: ../urpmi.addmedia_.c:75
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (S/n) "
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes paquetes conte�en %s: %s\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Prema enter cando estea..."
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor, insira o %s nomeado %s"
+
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
+"Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
+"d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../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 ""
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Mala elecci�n, probe de novo\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "�Cal � a s�a elecci�n? (1-%d) "
+
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Neces�tase un dos seguintes paquetes:"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Neces�tase un dos seguintes paquetes:"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "S� se lle permite � superusuario instalar paquetes locais"
+
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../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 "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../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 "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "S� se lle permite � superusuario instalar paquetes locais"
+#: ../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"
+msgstr ""
 
-#: ../urpmi_.c:349
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Neces�tase un dos seguintes paquetes:"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr ""
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Neces�tase un dos seguintes paquetes:"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "�Cal � a s�a elecci�n? (1-%d) "
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
+msgstr ""
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Mala elecci�n, probe de novo\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
 "%s\n"
-"do you agree ?"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi_.c:402
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "in order to install %s"
+msgid "retrieving mirrors at %s ..."
 msgstr "S� se lle permite � superusuario instalar paquetes locais"
 
-#: ../urpmi_.c:407
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "due to missing %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr ""
-
-#: ../urpmi_.c:416
-msgid "unrequested"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../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 ?"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
-"Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
-"d MB)"
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
-
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+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 ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:507
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor, insira o %s nomeado %s"
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Prema enter cando estea..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes paquetes conte�en %s: %s\n"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../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 ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (S/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"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "A instalaci�n fallou"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "instalando %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "�Probar a instalaci�n sen comprobar as dependencias? (s/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "�Probar a instalaci�n con menos comprobaci�ns (--force)? (s/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "xa est� todo instalado"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: ../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"
-msgstr ""
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:51
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr ""
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "A instalaci�n fallou"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr ""
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "A instalaci�n fallou"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
 #~ msgid "Only superuser is allowed to install local packages"
diff --git a/po/he.po b/po/he.po
index 187ae291..801a4dd5 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\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-02-14 15:39+0200\n"
 "Last-Translator: lev polvoi <lev@israsrv.net.il>\n"
 "Language-Team: Hebrew\n"
@@ -15,1501 +15,1671 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "מתקין את %s\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 "ב/ביטול"
 
-#: ../_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 "א/אישור"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "גרסת urpmf %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "זכויות יוצרים שמורות ל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 ""
-"התקנה אוטומטית של החבילות ... \n"
-"ביקשת התקנה של החבילות %s\n"
+"זוהי תוכנת חינם והיא עלולה להיות תחת רשיון הGPL של GNU ומסיבה זו היא עלולה "
+"לכלול את תנאי הרשיון"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "זה בסדר?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr ""
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "אישור"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "ביטול"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_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 "א/אישור"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_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 "ב/ביטול"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr "אישור/ביטול"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr ""
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr ""
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr ""
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr ""
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr ""
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr ""
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "לא נמצאה רשימת מדיה מלאה"
 
-#: ../_irpm_.c:63
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%sפקודה לא נמצאה \n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "webfetch לא ידוע `%s' !!!\n"
+msgid " (Y/n) "
+msgstr "אישור/ביטול"
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "פרוטוקול לא מזוהה הוגדר ל%s"
+msgid "Cancel"
+msgstr "ביטול"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "אישור"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "זה בסדר?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"התקנה אוטומטית של החבילות ... \n"
+"ביקשת התקנה של החבילות %s\n"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "אי-הצלחה בטיפול בפרוטוקול : %s"
+msgid "installing %s\n"
+msgstr "מתקין את %s\n"
 
-#: ../urpm.pm_.c:246
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "scp נפל במארח %s"
+msgid "unable to open rpmdb"
+msgstr "אי-הצלחה בעדכון מדיה  \"%s\"\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget לא נמצא \n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "אי-הצלחה בהעלאת קובץ בינארי [%s]"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
+msgid "%s conflicts with %s"
+msgstr "%s מתנגש עם %s"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl לא נמצא\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr "%s נזקק ע\"י %s"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
+msgid "unable to install package %s"
+msgstr "%s אי-הצלחה בהתקנת החבילה"
 
-#: ../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 "unable to remove package %s"
+msgstr "%sאי הצלחה במחיקת חבילה"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "הסרה נכשלה"
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:598
-#, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "אי-הצלחה בהעלאת קובץ בינארי [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "malformed input: [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "אי-הצלחה בהעלאת קובץ בינארי [%s]"
+msgid "unable to access medium \"%s\""
+msgstr "אי-הצלחה ביצירת מדיה \"%s\"\n"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm_.c:651
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "אי-הצלחה ביצירת מדיה \"%s\"\n"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%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:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../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 "אי-הצלחה ביצירת מדיה \"%s\"\n"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "החבילות הבאות מכילות %s : %s"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "no package named %s"
+msgstr "חבילות לא מוכרות"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
 msgstr "אי-הצלחה בהעלאת קובץ בינארי [%s]"
 
-#: ../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 "אי-הצלחה בהעלאת קובץ בינארי [%s]"
 
-#: ../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 "אי-הצלחה בעדכון מדיה  \"%s\"\n"
-
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr ""
+msgid "mounting %s"
+msgstr "מתקין את %s\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
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "אי-הצלחה בעדכון מדיה  \"%s\"\n"
-
-#: ../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 "אי-הצלחה בהעלאת קובץ בינארי [%s]"
-
-#: ../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 "scp נפל במארח %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 "הסרה נכשלה"
+msgid "unable to write list file of \"%s\""
+msgstr "אי-הצלחה ביצירת מדיה \"%s\"\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 "אי-הצלחה ביצירת מדיה \"%s\"\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "אי-הצלחה בעדכון מדיה  \"%s\"\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 "אי-הצלחה ביצירת מדיה \"%s\"\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 "scp נפל במארח %s"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "אי-הצלחה בהעלאת קובץ בינארי [%s]"
 
-#: ../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 "אי-הצלחה בהעלאת קובץ בינארי [%s]"
+msgid "...copying failed"
+msgstr "scp נפל במארח %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 "scp נפל במארח %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 "אי-הצלחה בעדכון מדיה  \"%s\"\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 "אי-הצלחה ביצירת מדיה \"%s\"\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\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access first installation medium"
+msgstr "אי-הצלחה בהעלאת קובץ בינארי [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid "problem reading hdlist file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "mounting %s"
-msgstr "מתקין את %s\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "אי-הצלחה בעדכון מדיה  \"%s\"\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 "אי-הצלחה בהעלאת קובץ בינארי [%s]"
 
-#: ../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 "אי-הצלחה בהעלאת קובץ בינארי [%s]"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "אי-הצלחה בהעלאת קובץ בינארי [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "אי-הצלחה ביצירת מדיה \"%s\"\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 "חבילות לא מוכרות"
-
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "החבילות הבאות מכילות %s : %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 "אי-הצלחה ביצירת מדיה \"%s\"\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 "אי-הצלחה ביצירת מדיה \"%s\"\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "אי-הצלחה בהעלאת קובץ בינארי [%s]"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "אי-הצלחה בהעלאת קובץ בינארי [%s]"
+
+#: ../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 "%sאי הצלחה במחיקת חבילה"
+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 "%s אי-הצלחה בהתקנת החבילה"
+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 "אי-הצלחה בהעלאת קובץ בינארי [%s]"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s נזקק ע\"י %s"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% הושלם ,מהירות = %s"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s מתנגש עם %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s הושלם זמן הגעה= %s, מהירות= %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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync failed: exited with %d or signal %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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "SSH חסר \n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "על node %s"
+msgid "rsync is missing\n"
+msgstr "rsync חסר \n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "rsync failed: exited with %d or signal %d\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 "התקנה נכשלה על הnode %s"
+msgid "curl is missing\n"
+msgstr "curl לא נמצא\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 "התקנה אפשרית"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: ../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"
+msgid "wget is missing\n"
+msgstr "wget לא נמצא \n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
 msgstr "scp נפל במארח %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "למארח %s אין גרסה טובה של urpmi"
+msgid "unable to handle protocol: %s"
+msgstr "אי-הצלחה בטיפול בפרוטוקול : %s"
 
-#: ../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"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
-"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"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "פרוטוקול לא מזוהה הוגדר ל%s"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - בחירה אוטומטית של חבילה מהאפשרויות.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "webfetch לא ידוע `%s' !!!\n"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "הסרה נכשלה"
+
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - ודא שההתקנה של החבילה יכולה להושג באופן נכון.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "כדי לספק את התלויות החבילות הבאות צריכות להמחק (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "בדיקה להסרה של החבילות הבאות"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - בחר את כל החבילות עם ביטוי מתאים.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "שום-דבר למחיקה"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
+msgid "removing package %s will break your system"
+msgstr "הסרת החבילה %s תשבור לך את המערכת"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "חבילה לא מוכרת"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "חבילות לא מוכרות"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "הסרת החבילה %s תשבור לך את המערכת"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "שום-דבר למחיקה"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - בחר את כל החבילות עם ביטוי מתאים.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "בדיקה להסרה של החבילות הבאות"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
-msgstr "כדי לספק את התלויות החבילות הבאות צריכות להמחק (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - ודא שההתקנה של החבילה יכולה להושג באופן נכון.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "הסרה נכשלה"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - בחירה אוטומטית של חבילה מהאפשרויות.\n"
 
-#: ../urpmf_.c:26
+#: ../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 ""
+
+#: ../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 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"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       -השתמש רק במדית העדכון.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"הקריאה היא :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - השתמש רק במדיה שנרשמה ע\"י comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - הדפס את כל התגים.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - הדפס את כל התגים.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose mode.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - השתמש רק במדיה שנרשמה ע\"י comma.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"הקריאה היא :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       -השתמש רק במדית העדכון.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
-msgstr ""
-
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
+"usage:\n"
 msgstr ""
-"  --wget         - יש צורך להשתמש בwget בכדי להחזיר את הקבצים המרוחקים.\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"
 
-#: ../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 בכדי להחזיר את הקבצים המרוחקים.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Everything already installed"
+msgstr "הכל כבר מותקן"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - הגבל את מהירות ההורדה.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "התקנה אפשרית"
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "התקנה נכשלה"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - הכנס שם וסיסמה לשימוש בPROX\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "נסה התקנה אפילו ביותר אגרסיביות (--force)? (כן/לא) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - צור מדית עדכון.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "נסה להתקין ללא בדיקת תלויות? (כן/לא)"
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
 msgstr ""
-"  --distrib      - צור אוטומטית את כל המדיות מההתקנה\n"
-"                   medium.\n"
 
-#: ../urpmi.addmedia_.c:64
+#: ../urpmi: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"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"ההתקנה נכשלה מכיוון שכמה קבצים חסרים:\n"
+"%s\n"
+"אתה עשוי לרצות לעדכן את ה urpmi database שלך"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - השתמש בכתובת מרשימת השרתים, ברירת המחדל הוא \n"
-"                   %s\n"
+msgid " (y/N) "
+msgstr "כן/לא"
 
-#: ../urpmi.addmedia_.c:69
-#, fuzzy
-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      - השתמש בגרסה מסויימת, ברירת המחדל היא \n"
-"                   mandrake-release package installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "האם להמשיך בתהליך ההתקנה?"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - השתמש בארכיטקטורה מסוימת, ברירת המחדל היא\n"
-"                   mandrake-release package installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "לחבילות הבאות יש בעיה בחתימות"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "נא להקיש אנטר"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "אנא הכנס את המדיה הנקראת \"%s\"  להתקן [%s]"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "אי-הצלחה בקבלת חבילות מקור , מבטל"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "לא יכול להוסיף עדכונים של הפצת cooker\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "בכדי לספק את התלויות החבילות הבאות יותקנו (%d MB)"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"אתה צריך הרשאות מנהל בכדי להתקין את התלויות הבאות: \n"
 "%s\n"
-"אין צורך לתת <relative path of hdlist> עם --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "אי-הצלחה בעדכון מדיה  \"%s\"\n"
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"החבילות הבאות עומדות להמחק כדי שהחבילות האחרות יוכלו להשתדרג: \n"
 "%s\n"
-"<relative path of hdlist> חסר\n"
+"האם אתה מסכים?"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
-msgstr ""
+msgid "unrequested"
+msgstr "לא בוקש"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "אי-הצלחה ביצירת מדיה \"%s\"\n"
+msgid "due to conflicts with %s"
+msgstr "נוטה להתנגשויות עם %s"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
 msgstr ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name>זה שם המדיה המיועדת להסרה\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "בכדי להתקין %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
-"\n"
-"אפשרויות לא מוכרות '%s'\n"
+"כמה חבילות מבוקשות אינן יכולות להותקן : \n"
+"%s\n"
+"האם אתה מסכים?"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "שום דבר להסרה (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "מצטער ,בחירה רעה, נסה שוב \n"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"שום כניסה המיודעת להסרה אינה חסרה\n"
-"(one of %s)\n"
+msgid "What is your choice? (1-%d) "
+msgstr "מה היא בחירתך? (1-%d)"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> זה שם המדיה המיודעת לעדכון.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "אחת החבילות הבאות דרושה:"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "אחת החבילות הבאות דרושה בשביל ההתקנה %s"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - בחר את כל המדיות האינן ניתנות להסרה.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "רק משתמש בעל הרשאות מנהל מורשה להתקין חבילות"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d             - הכרח סיום מלא של הקובץ depslist.ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "משתמש בסביבה מסיומת על  %s\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "שום דבר לעדכון (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "אי-הצלחה ביצירת ספריה. [%s] בשביל לדווח על באג"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"שום כניסה המיועדת לעדכון אינה חסרה\n"
-"(one of %s)\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 "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"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"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:86
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:100
+#: ../urpmi:1
+#, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:103
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
+"  --proxy-user   - הכנס שם וסיסמה לשימוש בPROX\n"
+"                   authentication (format is <user:password>).\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\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 ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr ""
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - הגבל את מהירות ההורדה.\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 "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
+"  --curl         -  יש צורך להשתמש בcurl בכדי להחזיר את הקבצים המרוחקים.\n"
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
+"  --wget         - יש צורך להשתמש בwget בכדי להחזיר את הקבצים המרוחקים.\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "אי-הצלחה ביצירת ספריה. [%s] בשביל לדווח על באג"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "משתמש בסביבה מסיומת על  %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "רק משתמש בעל הרשאות מנהל מורשה להתקין חבילות"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpmi_.c:349
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "אחת החבילות הבאות דרושה בשביל ההתקנה %s"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "אחת החבילות הבאות דרושה:"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "מה היא בחירתך? (1-%d)"
-
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "מצטער ,בחירה רעה, נסה שוב \n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"כמה חבילות מבוקשות אינן יכולות להותקן : \n"
-"%s\n"
-"האם אתה מסכים?"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "בכדי להתקין %s"
-
-#: ../urpmi_.c:407
-#, c-format
-msgid "due to unsatisfied %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:409
+#: ../urpmi:1
 #, c-format
-msgid "due to missing %s"
+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 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"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "נוטה להתנגשויות עם %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "אי-הצלחה בעדכון מדיה  \"%s\"\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "לא בוקש"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "אי-הצלחה ביצירת מדיה \"%s\"\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 ""
-"החבילות הבאות עומדות להמחק כדי שהחבילות האחרות יוכלו להשתדרג: \n"
-"%s\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 "בכדי לספק את התלויות החבילות הבאות יותקנו (%d MB)"
-
-#: ../urpmi_.c:463
-#, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
 "%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"אתה צריך הרשאות מנהל בכדי להתקין את התלויות הבאות: \n"
 "%s\n"
+"<relative path of hdlist> חסר\n"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "אי-הצלחה בקבלת חבילות מקור , מבטל"
-
-#: ../urpmi_.c:495
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s הושלם זמן הגעה= %s, מהירות= %s"
-
-#: ../urpmi_.c:498
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% הושלם ,מהירות = %s"
-
-#: ../urpmi_.c:507
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "אנא הכנס את המדיה הנקראת \"%s\"  להתקן [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "נא להקיש אנטר"
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "לחבילות הבאות יש בעיה בחתימות"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "האם להמשיך בתהליך ההתקנה?"
-
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr "כן/לא"
-
-#: ../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"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"ההתקנה נכשלה מכיוון שכמה קבצים חסרים:\n"
 "%s\n"
-"אתה עשוי לרצות לעדכן את ה urpmi database שלך"
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "התקנה נכשלה"
+"אין צורך לתת <relative path of hdlist> עם --distrib"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "נסה להתקין ללא בדיקת תלויות? (כן/לא)"
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "נסה התקנה אפילו ביותר אגרסיביות (--force)? (כן/לא) "
-
-#: ../urpmi_.c:631
-#, fuzzy
-msgid "Everything already installed"
-msgstr "הכל כבר מותקן"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "לא יכול להוסיף עדכונים של הפצת cooker\n"
 
-#: ../urpmq_.c:35
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update: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"
 "\n"
-"usage:\n"
+"unknown options '%s'\n"
 msgstr ""
-"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"
+"אפשרויות לא מוכרות '%s'\n"
 
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
+"  --arch         - השתמש בארכיטקטורה מסוימת, ברירת המחדל היא\n"
+"                   mandrake-release package installed.\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --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      - השתמש בגרסה מסויימת, ברירת המחדל היא \n"
+"                   mandrake-release package installed.\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
+"  --from         - השתמש בכתובת מרשימת השרתים, ברירת המחדל הוא \n"
+"                   %s\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../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 ""
 
-#: ../urpmq_.c:64
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
+"  --distrib      - צור אוטומטית את כל המדיות מההתקנה\n"
+"                   medium.\n"
 
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -a             - בחר את כל החבילות עם ביטוי מתאים.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - צור מדית עדכון.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"שום כניסה המיודעת להסרה אינה חסרה\n"
+"(one of %s)\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "שום דבר להסרה (use urpmi.addmedia to add a media)\n"
+
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name>זה שם המדיה המיועדת להסרה\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"שום כניסה המיועדת לעדכון אינה חסרה\n"
+"(one of %s)\n"
 
-#: placeholder.h:18
+#: ../urpmi.update:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "גרסת urpmf %s"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "שום דבר לעדכון (use urpmi.addmedia to add a media)\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "זכויות יוצרים שמורות לMandrakeSoft"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d             - הכרח סיום מלא של הקובץ depslist.ordered.\n"
 
-#: placeholder.h:20
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - בחר את כל המדיות האינן ניתנות להסרה.\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr ""
+
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"זוהי תוכנת חינם והיא עלולה להיות תחת רשיון הGPL של GNU ומסיבה זו היא עלולה "
-"לכלול את תנאי הרשיון"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> זה שם המדיה המיודעת לעדכון.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:25
-msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -a             - בחר את כל החבילות עם ביטוי מתאים.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (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 ""
+"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"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "התקנה נכשלה על הnode %s"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "לא נמצאה רשימת מדיה מלאה"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync חסר \n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "על node %s"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync failed: exited with %d or signal %d\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp נפל במארח %s"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "SSH חסר \n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "למארח %s אין גרסה טובה של urpmi"
diff --git a/po/hr.po b/po/hr.po
index 5ed65099..a811b36b 100644
--- a/po/hr.po
+++ b/po/hr.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: 2002-03-08 13:56CET\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -14,1151 +14,1229 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instaliram %s\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 "YyDd"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf verzija %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Autorska prava (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 ""
-"Automatska instalacija paketa...\n"
-"Zatra�ili ste instalaciju paketa %s\n"
+"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Da li se sla�ete s tim?"
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "uporaba: urpmf [opcije] <datoteka>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "U redu"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - ne ispisuje ime oznake (podrazumijevano ako nije dana "
+"oznaka na komandnoj"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Odustani"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    liniji, nekompaktibilno sa interaktivnim modom)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - ispi�i sve oznake."
 
-#: ../_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 "YyDd"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - ispisuje ime oznake: rpm datoteku (podrazumijeva se ako "
+"nema dane oznake na"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (D/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    komandnoj liniji ali bez imena paketa)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         -ispisuje oznaku group: grupu."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - ispisuje oznaku size: veli�inu."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - ispisuje oznaku serial: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - ispisuje oznaku summary: sa�eto."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - ispisuje oznaku description: opis."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - ispisuje oznaku provides: sve �to pru�a (vi�e linija)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - ispisuje oznaku requires: sve �to zahtjeva (vi�e linija)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - ispisuje oznaku files: sve datoteke (vi�e linija)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - ispisuje oznaku conflicts: sve konflikte (vi�e linija)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (vi�e linija)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - ispisuje oznaku prereqs: sve prereqs (vi�e linija)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "probajte urpmf --help za vi�e opcija"
 
-#: ../_irpm_.c:63
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "nije prona�en popis punih medija"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: komanda nije prona�ena\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (D/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
+msgid "Cancel"
+msgstr "Odustani"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "U redu"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Da li se sla�ete s tim?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Automatska instalacija paketa...\n"
+"Zatra�ili ste instalaciju paketa %s\n"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "nije prona�en niti jedan webfetch (curl ili wget trenutno)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instaliram %s\n"
 
-#: ../urpm.pm_.c:226
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ne mogu napraviti hdlist: %s"
+msgid "unable to open rpmdb"
+msgstr "ne mogu registrirati rpm datoteku"
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...kopiranje neuspje�no"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget nedostaje\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget neuspje�an: iza�ao je sa %d ili signalom %d\n"
+msgid "%s is needed by %s"
+msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl nedostaje\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "medij \"%s\" poku�ava koristiti ve� kori�teni popis, medij ignoriran"
+msgid "unable to remove package %s"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../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"
+msgid "Preparing..."
 msgstr ""
-"ne mogu se pobriniti za medij \"%s\" po�to se list datoteka ve� koristi za "
-"drugi medij"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"ne mogu koristiti \"%s\" za bezimeni medij zato �to se to ime ve� koristi"
+msgid "...retrieving failed: %s"
+msgstr "...dohva�anje neuspje�no: %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "ne mogu uzeti medij \"%s\" u ra�un po�to list datoteka [%s] ne postoji"
+msgid "...retrieving done"
+msgstr "...dohvat zavr�en"
 
-#: ../urpm.pm_.c:589
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne mogu odrediti medij od navedene hdlist datoteke [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "dohva�am rpms datoteku..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
+msgid "malformed input: [%s]"
+msgstr "nepravilan unos: [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ne mogu pristupiti list datoteci od \"%s\", medij ignoriran"
+msgid "unable to access medium \"%s\""
+msgstr "ne mogu pristupiti mediju \"%s\""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "poku�avam zaobi�i postoje�i medij \"%s\", izbjegavam"
+msgid "urpmi database locked"
+msgstr "urpmi baza zaklju�ana"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne mogu prona�i hdlist datoteku za \"%s\", medij ignoriran"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "nepotpun medij \"%s\" ozna�en kao prenosiv ali nije zapravo"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ne mogu prona�i list datoteku za \"%s\", medij ignoriran"
+msgid "medium \"%s\" is not selected"
+msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nepotpuna list datoteka za \"%s\", medij ignoriran"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu pro�itati rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne mogu provjeriti list datoteku za \"%s\", medij ignoriran"
+msgid "package %s is not found."
+msgstr "paket %s nije prona�en."
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previ�e to�aka montiranja za prenosivi medij \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam prenosivi ure�aj kao \"%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:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koristim razli�ite prenosive ure�aje [%s] za \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "postoji vi�e paketa sa istim rpm imenom datoteke \"%s\""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
+msgid "The following packages contain %s: %s"
+msgstr "Slijede�i paketi sadr�e %s: %s"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ne mogu zapisati config datoteku [%s]"
+msgid "no package named %s"
+msgstr "ne postoji paket pod nazivom %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "zapisana config datoteka [%s]"
+msgid "error registering local packages"
+msgstr "gre�ka prilikom registriranja lokalnih paketa"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to register rpm file"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "ispitujem hdlist datoteku [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "dohva�am rpms datoteku..."
 
-#: ../urpm.pm_.c:776
-#, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "prona�ao sam ispitani hdlist (ili synthesis) kao %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "nepravilno ime rpm datoteke [%s]"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "no entries relocated in depslist"
+msgstr "nema unosa premje�tenih u depslist"
 
-#: ../urpm.pm_.c:784
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ne mogu a�urirati medij \"%s\"\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "premje�teno %s unosa u depslist-u"
 
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "  --all           - ispi�i sve oznake."
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "odmontiravam %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "montiram %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "uklanjam %d zastarjelih zaglavlja u priru�noj memoriji"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "prona�eno %d zaglavlja u priru�noj memoriji"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../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]"
 msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../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]"
 msgstr "ispitujem synthesis datoteku [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
+#, c-format
+msgid "building hdlist [%s]"
+msgstr "izgra�ujem hdlist [%s]"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
+msgid "reading headers from medium \"%s\""
+msgstr "uklanjam medij \"%s\""
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "ne mogu registrirati rpm datoteku"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medij \"%s\" ve� postoji"
+msgid "nothing written in list file for \"%s\""
+msgstr "nema ni�ta za zapisati u list datoteku za \"%s\""
 
-#: ../urpm.pm_.c:918
-#, c-format
-msgid "added medium %s"
-msgstr "dodan medij %s"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "nije prona�ena hdlist datoteka za medij \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "ne mogu pristupiti prvom instalacijskom mediju"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "kopiram hdlists datoteku..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kopiranje zavr�eno"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kopiranje zavr�eno"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nije prona�ena hdlist datoteka za medij \"%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)"
-msgstr ""
-"ne mogu pristupiti prvom instalacijskom mediju (nije prona�en Mandrake/base/"
-"hdlists)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "dohva�anje hdlist (ili synthesis) izvora neuspje�no"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "dohva�am hdlists datoteku..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...dohvat zavr�en"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...dohva�anje neuspje�no: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "dohva�am hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "nepravilni hdlist opis \"%s\" u hdlists datoteci"
+msgid "retrieving description file of \"%s\"..."
+msgstr "dohva�am opis datoteka od \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "poku�avam izabrati nepostoje�i medij \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nisu prona�ene rpm datoteke u [%s]"
 
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ne mogu pro�itati rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "poku�avam izabrati vi�estruki medij: %s"
+msgid "reading rpm files from [%s]"
+msgstr "nisu prona�ene rpm datoteke u [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "uklanjam medij \"%s\""
+msgid "...copying done"
+msgstr "...kopiranje zavr�eno"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi baza zaklju�ana"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...kopiranje zavr�eno"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu pristupiti mediju \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "kopiram popis izvora od \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopiranje opisne datoteke od \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "kopiranje [%s] neuspje�no"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "kopiranje [%s] neuspje�no"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "ispitujem hdlist datoteku [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "kopiranje opisne datoteke od \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopiram popis izvora od \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "uklanjam medij \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "nisu prona�ene rpm datoteke u [%s]"
+msgid "selecting multiple media: %s"
+msgstr "poku�avam izabrati vi�estruki medij: %s"
 
-#: ../urpm.pm_.c:1267
-#, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ne mogu pro�itati rpm datoteku [%s] sa medija \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nisu prona�ene rpm datoteke u [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "poku�avam izabrati nepostoje�i medij \"%s\""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "dohva�am opis datoteka od \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"ne mogu pristupiti prvom instalacijskom mediju (nije prona�en Mandrake/base/"
+"hdlists)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "dohva�am hdlist (ili synthesis) izvor od \"%s\"..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "nepravilni hdlist opis \"%s\" u hdlists datoteci"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "dohva�anje hdlist (ili synthesis) izvora neuspje�no"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving hdlists file..."
+msgstr "dohva�am hdlists datoteku..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nije prona�ena hdlist datoteka za medij \"%s\""
+msgid "copying hdlists file..."
+msgstr "kopiram hdlists datoteku..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr ""
+msgid "unable to access first installation medium"
+msgstr "ne mogu pristupiti prvom instalacijskom mediju"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
+msgid "added medium %s"
+msgstr "dodan medij %s"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ne mogu zapisati list datoteku za \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "medij \"%s\" ve� postoji"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "nije prona�ena hdlist datoteka za medij \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../urpm.pm_.c:1528
-#, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nema ni�ta za zapisati u list datoteku za \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "  --all           - ispi�i sve oznake."
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "ne mogu a�urirati medij \"%s\"\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "uklanjam medij \"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr "prona�ao sam ispitani hdlist (ili synthesis) kao %s"
 
-#: ../urpm.pm_.c:1597
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "izgra�ujem hdlist [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "prona�eno %d zaglavlja u priru�noj memoriji"
+msgid "write config file [%s]"
+msgstr "zapisana config datoteka [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "uklanjam %d zastarjelih zaglavlja u priru�noj memoriji"
+msgid "unable to write config file [%s]"
+msgstr "ne mogu zapisati config datoteku [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "montiram %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "odmontiravam %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "koristim razli�ite prenosive ure�aje [%s] za \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "premje�teno %s unosa u depslist-u"
+msgid "taking removable device as \"%s\""
+msgstr "uzimam prenosivi ure�aj kao \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "nema unosa premje�tenih u depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "previ�e to�aka montiranja za prenosivi medij \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nepravilno ime rpm datoteke [%s]"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ne mogu provjeriti list datoteku za \"%s\", medij ignoriran"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "dohva�am rpms datoteku..."
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nepotpuna list datoteka za \"%s\", medij ignoriran"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne mogu pristupiti rpm datoteci [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ne mogu prona�i list datoteku za \"%s\", medij ignoriran"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ne mogu pristupiti rpm datoteci [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne mogu prona�i hdlist datoteku za \"%s\", medij ignoriran"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "gre�ka prilikom registriranja lokalnih paketa"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "poku�avam zaobi�i postoje�i medij \"%s\", izbjegavam"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "ne postoji paket pod nazivom %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ne mogu pristupiti list datoteci od \"%s\", medij ignoriran"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Slijede�i paketi sadr�e %s: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
 
-#: ../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\""
-msgstr "postoji vi�e paketa sa istim rpm imenom datoteke \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne mogu odrediti medij od navedene hdlist datoteke [%s]"
 
-#: ../urpm.pm_.c:2147
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "ne mogu uzeti medij \"%s\" u ra�un po�to list datoteka [%s] ne postoji"
 
-#: ../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 "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
+"ne mogu koristiti \"%s\" za bezimeni medij zato �to se to ime ve� koristi"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"ne mogu se pobriniti za medij \"%s\" po�to se list datoteka ve� koristi za "
+"drugi medij"
 
-#: ../urpm.pm_.c:2183
-#, c-format
-msgid "package %s is not found."
-msgstr "paket %s nije prona�en."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "medij \"%s\" poku�ava koristiti ve� kori�teni popis, medij ignoriran"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medij \"%s\" nije izabran"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "medij \"%s\" poku�ava koristiti ve� kori�teni hdlist, medij ignoriran"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu pro�itati rpm datoteku [%s] sa medija \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "gre�ka u sintaksi u config datoteci na liniji %s"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "nepotpun medij \"%s\" ozna�en kao prenosiv ali nije zapravo"
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "nepravilan unos: [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "dohva�am rpms datoteku..."
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "curl neuspje�an: iza�ao je sa %d ili sa signalom %d\n"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr ""
-
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+msgid "ssh is missing\n"
+msgstr "wget nedostaje\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+msgid "rsync is missing\n"
+msgstr "curl nedostaje\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr ""
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl neuspje�an: iza�ao je sa %d ili sa signalom %d\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../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 ""
+msgid "curl is missing\n"
+msgstr "curl nedostaje\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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget neuspje�an: iza�ao je sa %d ili signalom %d\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "wget is missing\n"
+msgstr "wget nedostaje\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalacija nije uspjela"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "Instalacija nije uspjela"
+msgid "copy failed: %s"
+msgstr "...kopiranje neuspje�no"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Instalacija nije uspjela"
+msgid "unable to handle protocol: %s"
+msgstr "ne mogu napraviti hdlist: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr ""
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "nije prona�en niti jedan webfetch (curl ili wget trenutno)\n"
 
-#: ../urpme_.c:39
-#, fuzzy, 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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
 msgstr ""
-"urpmi ina�ica %s\n"
-"Autorska prava (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPLa.\n"
-"\n"
-"uporaba:\n"
 
-#: ../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           - ispi�i ovaj tekst s pomo�i.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-#, fuzzy
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatski izaberi dobar paket u izborima.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "...kopiranje neuspje�no"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Kako bi zadovoljili ovisnosti, slijede�i paketi �e biti uklonjeni (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Jedan od slijede�ih paketa je potreban:"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - odabire sve odgovaraju�e na komandnoj liniji.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Nema ni�ta za ukloniti.\n"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
+msgid "removing package %s will break your system"
+msgstr "uklanjanje paketa %s �e pokvariti va� sustav\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "nepoznati paket(i) "
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "nepoznati paket(i) "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "uklanjanje paketa %s �e pokvariti va� sustav\n"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
 
-#: ../urpme_.c:95
-#, fuzzy
-msgid "Nothing to remove"
-msgstr "Nema ni�ta za ukloniti.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - odabire sve odgovaraju�e na komandnoj liniji.\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Jedan od slijede�ih paketa je potreban:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Kako bi zadovoljili ovisnosti, slijede�i paketi �e biti uklonjeni (%d MB)"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "...kopiranje neuspje�no"
+#: ../urpme:1 ../urpmi:1
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatski izaberi dobar paket u izborima.\n"
 
-#: ../urpmf_.c:26
+#: ../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           - ispi�i ovaj tekst s pomo�i.\n"
+
+#: ../urpme:1
 #, fuzzy, 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 ""
-"urpmq ina�ica %s\n"
-"Autorska prava (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmi ina�ica %s\n"
+"Autorska prava (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPLa.\n"
 "\n"
 "uporaba:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo medije za dogradnju.\n"
-
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - koristi samo medije popisane zarezom.\n"
-
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - op�iran mod.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - odabire sve odgovaraju�e na komandnoj liniji.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-"  --quiet         - ne ispisuje ime oznake (podrazumijevano ako nije dana "
-"oznaka na komandnoj"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - odabire sve odgovaraju�e na komandnoj liniji.\n"
 
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - ispi�i sve oznake."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  -u             - ukloni paket ukoliko bolja ina�ica ve� postoji.\n"
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../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"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --name          - ispisuje ime oznake: rpm datoteku (podrazumijeva se ako "
-"nema dane oznake na"
 
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         -ispisuje oznaku group: grupu."
-
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - ispisuje oznaku size: veli�inu."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr "  -u             - ukloni paket ukoliko bolja ina�ica ve� postoji.\n"
 
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - ispisuje oznaku size: veli�inu."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - o�isti ke� direktorij zaglavlja.\n"
 
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - ispisuje oznaku summary: sa�eto."
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - ispi�i verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - ispisuje oznaku description: opis."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - ispisuje oznaku provides: sve �to pru�a (vi�e linija)."
+"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (vi�e linija)."
 
-#: ../urpmf_.c:47
-#, fuzzy
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - ispisuje oznaku requires: sve �to zahtjeva (vi�e linija)."
+"  --conflicts     - ispisuje oznaku conflicts: sve konflikte (vi�e linija)."
 
-#: ../urpmf_.c:48
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr "  --files         - ispisuje oznaku files: sve datoteke (vi�e linija)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - ispisuje oznaku conflicts: sve konflikte (vi�e linija)."
+"  --requires      - ispisuje oznaku requires: sve �to zahtjeva (vi�e linija)."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (vi�e linija)."
+"  --provides      - ispisuje oznaku provides: sve �to pru�a (vi�e linija)."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - ispisuje oznaku description: opis."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - ispi�i verziju, izdanje i arhitekturu sa imenom.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - ispisuje oznaku summary: sa�eto."
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - o�isti ke� direktorij zaglavlja.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - ispisuje oznaku size: veli�inu."
 
-#: ../urpmf_.c:54
-#, fuzzy
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -u             - ukloni paket ukoliko bolja ina�ica ve� postoji.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - ispisuje oznaku size: veli�inu."
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         -ispisuje oznaku group: grupu."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
+"  --name          - ispisuje ime oznake: rpm datoteku (podrazumijeva se ako "
+"nema dane oznake na"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  -u             - ukloni paket ukoliko bolja ina�ica ve� postoji.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - ispi�i sve oznake."
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - odabire sve odgovaraju�e na komandnoj liniji.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet         - ne ispisuje ime oznake (podrazumijevano ako nije dana "
+"oznaka na komandnoj"
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - odabire sve odgovaraju�e na komandnoj liniji.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - op�iran mod.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - koristi samo medije popisane zarezom.\n"
+
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo medije za dogradnju.\n"
+
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"uporaba: urpmi.addmedia [opcije] <ime> <url> [with <relativnom_putanjom>]\n"
-"gdje je <url> jedan od\n"
-"       file://<putanja>\n"
-"       ftp://<login>:<lozinka>@<host>/<putanja> with <relativnim imenom od "
-"hdlist>\n"
-"       ftp://<host>/<putanja> with <relativnim imenom od hdlist>\n"
-"       http://<host>/<putanja> with <relativnim imenom od hdlist>\n"
-"       removable://<putanja>\n"
+"urpmq ina�ica %s\n"
+"Autorska prava (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPLa.\n"
 "\n"
-"i [opcije] su od\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         - koristi wget za dohva�anje udaljenih datoteka.\n"
+"uporaba:\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         - koristi curl za dohva�anje udaljenih datoteka.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "sve je ve� instalirano"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Instalacija nije uspjela"
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Poku�ati instalaciju jo� sna�nije (--force)? (d/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - napravi medij za dogradnju.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Poku�ati instalaciju bez provjere ovisnosti (d/N) "
 
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - automatski napravi sve medije iz instalacijskog medija.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "instaliram %s\n"
 
-#: ../urpmi.addmedia_.c:64
+#: ../urpmi:1
+#, fuzzy, 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"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"Instalacija neuspje�na, neke datoteke nedostaju.\n"
+"Mo�da �ete po�eljeti dograditi va�u urpmi bazu"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-
-#: ../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"
-msgstr ""
+msgid " (y/N) "
+msgstr " (d/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - o�isti ke� direktorij zaglavlja.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Slijede�i paketi sadr�e %s: %s"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - poku�aj prona�i i koristiti synthesis ili hdlist "
-"datoteku.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Pritisnite Enter kada ste gotovi..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Molim umetnite medij pod nazivom \"%s\" u ure�aj [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne mogu a�urirati medij \"%s\"\n"
+"Kako bi zadovoljili sve ovisnosti paketa slijede�i moram instalirati "
+"slijede�e pakete (%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Morate biti administrator(root) kako bi instalirali slijede�e ovisnosti:\n"
 "%s\n"
-"<relativna putanja do hdlist> nedostaje\n"
 
-#: ../urpmi.addmedia_.c:205
-#, c-format
+#: ../urpmi:1
+#, fuzzy, 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 ""
-"%s\n"
-"`with' nedostaje za ftp medij\n"
+"neki paketi moraju biti uklonjeni da bi mogli biti nadogra�eni, ovo jo� "
+"uvijek nije podr�ano\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne mogu napraviti medij \"%s\"\n"
+msgid "unrequested"
+msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
-"uporaba: urpmi.removemedia [-a] <ime> ...\n"
-"gdje je <ime> ime medija za ukloniti.\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - odaberi sve medije.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "wget nedostaje\n"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"\n"
-"nepoznata opcija '%s'\n"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"nema ni�ta za uklanjanje (koristite urpmi.addmedia za dodavanje medija)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../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 ""
-"nedostaje unos za uklanjanje\n"
-"(jedan od %s)\n"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"uporaba: urpmi.update [opcije] <ime> ...\n"
-"gdje je <ime> ime medija za dogradnju.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "�alim, lo� odabir, poku�ajte ponovo\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - koristi samo medije za dogradnju.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Izaberite jedan? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - odaberi sve neprenosive medije.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Jedan od slijede�ih paketa je potreban:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - prisiljava kompletan izra�un depslist.ordered datoteke.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jedan od slijede�ih paketa je potreban za instaliranje %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"nema ni�ta za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"nedostaje unos za nadogradnju\n"
-"(jedan od %s)\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
+
+#: ../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 "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"urpmi ina�ica %s\n"
-"Autorska prava (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPLa.\n"
-"\n"
-"uporaba:\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-#, fuzzy
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automatski izaberi pakete za dogradnju sustava.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  imena ili rpm datoteke dane na komandnoj liniji se instaliraju.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - uklju�i fuzzy pretra�ivanje (isto kao -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - op�iran mod.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - slijede�i paket je izvori�ni(source) paket (isto kao -"
-"s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi mod.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
+"  -s             - slijede�i paket je izvori�ni paket (isto kao --src).\n"
 
-#: ../urpmi_.c:81
-#, fuzzy
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --noclean      - zadr�i rpm koji nije kori�ten u me�uspremniku.\n"
-
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - zadr�i rpm koji nije kori�ten u me�uspremniku.\n"
-
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - prisili pozivanje iako neki paketi ne postoje.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -v             - uklju�i fuzzy pretra�ivanje (isto kao --fuzzy).\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
+"  -P             - nemoj pretra�ivati u provides kako bi prona�li paket.\n"
 
-#: ../urpmi_.c:86
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
+"  -p             - dozvoli pretra�ivanje u provides kako bi prona�ao paket.\n"
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - odabire sve odgovaraju�e na komandnoj liniji.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --media        - koristi samo medije popisane zarezom.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - koristi X su�elje.\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
@@ -1166,442 +1244,475 @@ msgstr ""
 "  --best-output  - izaberi najbolje su�elje prema okru�enju:\n"
 "                   X ili tekst mod.\n"
 
-#: ../urpmi_.c:103
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - koristi X su�elje.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-#, fuzzy
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --media        - koristi samo medije popisane zarezom.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - odabire sve odgovaraju�e na komandnoj liniji.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  -p             - dozvoli pretra�ivanje u provides kako bi prona�ao paket.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  -P             - nemoj pretra�ivati u provides kako bi prona�li paket.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -v             - uklju�i fuzzy pretra�ivanje (isto kao --fuzzy).\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             - slijede�i paket je izvori�ni paket (isto kao --src).\n"
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tihi mod.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - op�iran mod.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr ""
 
-#: ../urpmi_.c:114
-#, fuzzy
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  imena ili rpm datoteke dane na komandnoj liniji se instaliraju.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - koristi curl za dohva�anje udaljenih datoteka.\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: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - koristi wget za dohva�anje udaljenih datoteka.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:223
-#, fuzzy, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
-
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-
-#: ../urpmi_.c:349
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jedan od slijede�ih paketa je potreban za instaliranje %s:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Jedan od slijede�ih paketa je potreban:"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - prisili pozivanje iako neki paketi ne postoje.\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Izaberite jedan? (1-%d) "
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - zadr�i rpm koji nije kori�ten u me�uspremniku.\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "�alim, lo� odabir, poku�ajte ponovo\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --noclean      - zadr�i rpm koji nije kori�ten u me�uspremniku.\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:402
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-
-#: ../urpmi_.c:407
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
+"  --src          - slijede�i paket je izvori�ni(source) paket (isto kao -"
+"s).\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - uklju�i fuzzy pretra�ivanje (isto kao -y).\n"
+
+#: ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget nedostaje\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - automatski izaberi pakete za dogradnju sustava.\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi:1
 #, c-format
-msgid "due to conflicts with %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:416
-msgid "unrequested"
+#: ../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"
 msgstr ""
+"urpmi ina�ica %s\n"
+"Autorska prava (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPLa.\n"
+"\n"
+"uporaba:\n"
 
-#: ../urpmi_.c:421
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne mogu a�urirati medij \"%s\"\n"
+
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne mogu napraviti medij \"%s\"\n"
+
+#: ../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 ""
-"neki paketi moraju biti uklonjeni da bi mogli biti nadogra�eni, ovo jo� "
-"uvijek nije podr�ano\n"
+"%s\n"
+"`with' nedostaje za ftp medij\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Kako bi zadovoljili sve ovisnosti paketa slijede�i moram instalirati "
-"slijede�e pakete (%d MB)"
+"%s\n"
+"<relativna putanja do hdlist> nedostaje\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 ""
-"Morate biti administrator(root) kako bi instalirali slijede�e ovisnosti:\n"
 "%s\n"
+"nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "dohva�am rpms datoteku..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"nepoznata opcija '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Molim umetnite medij pod nazivom \"%s\" u ure�aj [%s]"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Pritisnite Enter kada ste gotovi..."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - poku�aj prona�i i koristiti synthesis ili hdlist "
+"datoteku.\n"
 
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Slijede�i paketi sadr�e %s: %s"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - o�isti ke� direktorij zaglavlja.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (d/N) "
+#: ../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 ""
 
-#: ../urpmi_.c:548
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"Instalacija neuspje�na, neke datoteke nedostaju.\n"
-"Mo�da �ete po�eljeti dograditi va�u urpmi bazu"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
+#: ../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 ""
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "instaliram %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Poku�ati instalaciju bez provjere ovisnosti (d/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Poku�ati instalaciju jo� sna�nije (--force)? (d/N) "
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatski napravi sve medije iz instalacijskog medija.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "sve je ve� instalirano"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - napravi medij za dogradnju.\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 ina�ica %s\n"
-"Autorska prava (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPLa.\n"
+"uporaba: urpmi.addmedia [opcije] <ime> <url> [with <relativnom_putanjom>]\n"
+"gdje je <url> jedan od\n"
+"       file://<putanja>\n"
+"       ftp://<login>:<lozinka>@<host>/<putanja> with <relativnim imenom od "
+"hdlist>\n"
+"       ftp://<host>/<putanja> with <relativnim imenom od hdlist>\n"
+"       http://<host>/<putanja> with <relativnim imenom od hdlist>\n"
+"       removable://<putanja>\n"
 "\n"
-"uporaba:\n"
-
-#: ../urpmq_.c:46
-#, fuzzy
-msgid "  --list         - list available packages.\n"
-msgstr "  --all           - ispi�i sve oznake."
-
-#: ../urpmq_.c:47
-#, fuzzy
-msgid "  --list-media   - list available media.\n"
-msgstr "  --all           - ispi�i sve oznake."
-
-#: ../urpmq_.c:48
-#, fuzzy
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --all           - ispi�i sve oznake."
-
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --all           - ispi�i sve oznake."
+"i [opcije] su od\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --headers      - izdvoji zaglavlja za pakete popisane iz urpmi baze na\n"
-"                   stdout (root samo).\n"
+"nedostaje unos za uklanjanje\n"
+"(jedan od %s)\n"
 
-#: ../urpmq_.c:53
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"  --sources      - daj sve izvorne pakete prije skidanja (root samo).\n"
+"nema ni�ta za uklanjanje (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - pro�iri ispitivanje ovisnosti paketa.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - odaberi sve medije.\n"
 
-#: ../urpmq_.c:64
-#, fuzzy
+#: ../urpmi.removemedia:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - ukloni paket ukoliko bolja ina�ica ve� postoji.\n"
-
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    komandnoj liniji ali bez imena paketa)."
-
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  -p             - dozvoli pretra�ivanje u provides kako bi prona�ao paket.\n"
-
-#: ../urpmq_.c:70
-#, fuzzy
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - ispi�i groupe tako�er sa imenom.\n"
-
-#: ../urpmq_.c:71
-#, fuzzy
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - ispi�i verzije i izdanja tako�er sa imenom.\n"
-
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
-
-#: ../urpmq_.c:174
-#, fuzzy
-msgid "--list-nodes can only be used with --parallel"
-msgstr "  --all           - ispi�i sve oznake."
+"uporaba: urpmi.removemedia [-a] <ime> ...\n"
+"gdje je <ime> ime medija za ukloniti.\n"
 
-#: placeholder.h:18
+#: ../urpmi.update:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf verzija %s"
-
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Autorska prava (C) 1999,2000,2001,2002 MandrakeSoft."
-
-#: placeholder.h:20
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPL."
+"nedostaje unos za nadogradnju\n"
+"(jedan od %s)\n"
 
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "uporaba: urpmf [opcije] <datoteka>"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nema ni�ta za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: placeholder.h:22
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  --quiet         - ne ispisuje ime oznake (podrazumijevano ako nije dana "
-"oznaka na komandnoj"
+"  -d             - prisiljava kompletan izra�un depslist.ordered datoteke.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    liniji, nekompaktibilno sa interaktivnim modom)."
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - odaberi sve neprenosive medije.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - ispi�i sve oznake."
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
-#: placeholder.h:25
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  --name          - ispisuje ime oznake: rpm datoteku (podrazumijeva se ako "
-"nema dane oznake na"
+"uporaba: urpmi.update [opcije] <ime> ...\n"
+"gdje je <ime> ime medija za dogradnju.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    komandnoj liniji ali bez imena paketa)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "  --all           - ispi�i sve oznake."
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         -ispisuje oznaku group: grupu."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu pro�itati rpm datoteku \"%s\"\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - ispisuje oznaku size: veli�inu."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nepoznate opcije \"-%s\", provjerite uporabu sa --help\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - ispisuje oznaku serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - ispisuje oznaku summary: sa�eto."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - ispi�i verzije i izdanja tako�er sa imenom.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - ispisuje oznaku description: opis."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - ispi�i groupe tako�er sa imenom.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"  --provides      - ispisuje oznaku provides: sve �to pru�a (vi�e linija)."
+"  -p             - dozvoli pretra�ivanje u provides kako bi prona�ao paket.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr ""
-"  --requires      - ispisuje oznaku requires: sve �to zahtjeva (vi�e linija)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    komandnoj liniji ali bez imena paketa)."
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - ispisuje oznaku files: sve datoteke (vi�e linija)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - ukloni paket ukoliko bolja ina�ica ve� postoji.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - pro�iri ispitivanje ovisnosti paketa.\n"
+
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - ispisuje oznaku conflicts: sve konflikte (vi�e linija)."
+"  --sources      - daj sve izvorne pakete prije skidanja (root samo).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (vi�e linija)."
+"  --headers      - izdvoji zaglavlja za pakete popisane iz urpmi baze na\n"
+"                   stdout (root samo).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr ""
-"  --prereqs       - ispisuje oznaku prereqs: sve prereqs (vi�e linija)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --all           - ispi�i sve oznake."
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "probajte urpmf --help za vi�e opcija"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --all           - ispi�i sve oznake."
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "nije prona�en popis punih medija"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --all           - ispi�i sve oznake."
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl neuspje�an: iza�ao je sa %d ili sa signalom %d\n"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --all           - ispi�i sve oznake."
 
-#, fuzzy
-#~ msgid "rsync is missing\n"
-#~ msgstr "curl nedostaje\n"
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq ina�ica %s\n"
+"Autorska prava (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPLa.\n"
+"\n"
+"uporaba:\n"
 
-#, fuzzy
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "curl neuspje�an: iza�ao je sa %d ili sa signalom %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalacija nije uspjela"
 
-#, fuzzy
-#~ msgid "ssh is missing\n"
-#~ msgstr "wget nedostaje\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "gre�ka u sintaksi u config datoteci na liniji %s"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
 
-#, fuzzy
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "medij \"%s\" poku�ava koristiti ve� kori�teni hdlist, medij ignoriran"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Instalacija nije uspjela"
+
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr ""
 
 #~ msgid "Remove them all?"
 #~ msgstr "Ukloniti ih sve?"
@@ -1625,12 +1736,6 @@ msgstr "nije prona�en popis punih medija"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - ispi�i ovaj tekst o pomo�i.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: nepoznate opcije \"-%s\", provjerite uporabu sa --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: ne mogu pro�itati rpm datoteku \"%s\"\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr "ne mogu napraviti sinteznu(synthesis) datoteku za medij \"%s\""
 
diff --git a/po/hu.po b/po/hu.po
index 546dbaa3..edc7403f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,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-03-02 21:43+0100\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -17,1176 +17,1293 @@ 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 telep�t�se folyamatban\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 "IiyY"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (C) MandrakeSoft, 1999, 2000, 2001, 2002"
+
+#: 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 ""
-"A csomagok automatikus telep�t�se...\n"
-"A(z) %s csomag telep�t�s�t k�rte...\n"
+"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "�gy rendben van?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "Haszn�lat: urpmf [opci�k] <f�jl>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "OK"
+# maxim�lis sorhossz: 80 karakter (karakteres termin�l sorhossza)
+# "." ne legyen a sztringek v�g�n
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - c�mke ki�r�s�nak elhagy�sa (ha nincs c�mke a "
+"parancssorban,"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "M�gsem"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
+"                    akkor ez l�p �letbe; interakt�v m�dban nem haszn�lhat�)"
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - az �sszes adat megjelen�t�se"
 
-#: ../_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 "IiyY"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - n�v megjelen�t�se (ha nincs megadva c�mke a "
+"parancssorban,"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (I/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    akkor automatikusan �letbe l�p)"
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - csoport megjelen�t�se"
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - m�ret megjelen�t�se"
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - sorozatsz�m megjelen�t�se"
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - �sszefoglal� megjelen�t�se"
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - le�r�s megjelen�t�se"
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - szolg�ltat�sjegyz�k megjelen�t�se (t�bb sor)"
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - k�vetelm�nyek megjelen�t�se (t�bb sor)"
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - f�jlnevek megjelen�t�se (t�bb sor)"
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr "  --conflicts     - �tk�z�sek megjelen�t�se (t�bb sor)"
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr "  --obsoletes     - t�lhaladott csomagok megjelen�t�se (t�bb sor)"
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - el�felt�telek megjelen�t�se (t�bb sor)"
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "tov�bbi opci�k�rt pr�b�lja meg az \"urpmf --help\" parancsot"
 
-#: ../_irpm_.c:63
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "teljes adatforr�slista nem tal�lhat�"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: a parancs nem tal�lhat�\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Ismeretlen let�lt�program: \"%s\".\n"
+msgid " (Y/n) "
+msgstr " (I/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "ismeretlen protokoll van defini�lva ehhez: \"%s\""
+msgid "Cancel"
+msgstr "M�gsem"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "nem tal�lhat� webes let�lt�program (curl vagy wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "protokollkezel�s sikertelen: %s"
+msgid "Is this OK?"
+msgstr "�gy rendben van?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "a m�sol�s sikertelen: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"A csomagok automatikus telep�t�se...\n"
+"A(z) %s csomag telep�t�s�t k�rte...\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "a wget nem tal�lhat�\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "%s telep�t�se folyamatban\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "a wget hib�val l�pett ki: \"%d\" hibak�d vagy \"%d\" szign�l\n"
+msgid "unable to open rpmdb"
+msgstr "az rpmdb megnyit�sa nem siker�lt"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "a curl nem tal�lhat�\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "a csomagf�jl nem �rhet� el: \"%s\""
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"a(z) \"%s\" adatforr�s egy haszn�latban lev� list�t pr�b�lt haszn�lni; az "
-"adatforr�s nem ker�l feldolgoz�sra"
+msgid "%s conflicts with %s"
+msgstr "%s �tk�zik ezzel: %s"
 
-#: ../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 ""
-"a(z) \"%s\" adatforr�s nem kezelhet�, mivel a listaf�jlt m�r haszn�lja egy "
-"m�sik adatforr�s"
+msgid "%s is needed by %s"
+msgstr "%s sz�ks�ges ehhez: %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "\"%s\" n�v nem adhat� az adatforr�snak, mivel m�r van ilyen n�v"
+msgid "unable to install package %s"
+msgstr "a(z) \"%s\" csomag telep�t�se sikertelen"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"a(z) \"%s\" adatforr�s nem vehet� figyelembe, mivel \"%s\" listaf�jl nem "
-"l�tezik"
+msgid "unable to remove package %s"
+msgstr "a(z) \"%s\" csomag elt�vol�t�sa sikertelen"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "a fejl�clist�hoz tartoz� adatforr�s nem hat�rozhat� meg: \"%s\""
+msgid "Preparing..."
+msgstr "El�k�sz�t�s..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
-"\"%s\" fejl�clist�ja nem el�rhet�; az adatforr�s nem ker�l feldolgoz�sra"
+msgid "...retrieving failed: %s"
+msgstr "...a behozatal sikertelen: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "\"%s\" listaf�jlja nem el�rhet�; az adatforr�s nem ker�l feldolgoz�sra"
+msgid "...retrieving done"
+msgstr "...behozatal megt�rt�nt"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "RPM f�jlok behozatala..."
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "a(z) \"%s\" n�ven l�tez� adatforr�s elker�l�se"
+msgid "malformed input: [%s]"
+msgstr "hib�s bevitel: \"%s\""
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-"\"%s\" fejl�clist�ja nem tal�lhat�; az adatforr�s nem ker�l feldolgoz�sra"
+msgid "unable to access medium \"%s\""
+msgstr "a(z) \"%s\" adatforr�s nem �rhet� el"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-"\"%s\" listaf�jlja nem tal�lhat�; az adatforr�s nem ker�l feldolgoz�sra"
+msgid "urpmi database locked"
+msgstr "az urpmi adatb�zis z�rolt"
 
-#: ../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 "a(z) \"%s\" hib�s adatforr�s cser�lhet�nek van jel�lve, pedig nem az"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "a(z) \"%s\" adatforr�s nincs kijel�lve"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "a(z) \"%s\" csomagf�jl (RPM) nem olvashat� a(z) \"%s\" adatforr�sb�l"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
+msgstr "a csomag nem tal�lhat�: \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
-"hib�s listaf�jl a(z) \"%s\" adatforr�shoz; az adatforr�s nem ker�l "
-"feldolgoz�sra"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid ""
+"medium \"%s\" use an invalid list file (mirror is problably not up-to-date, "
+"trying to use alternate method)"
 msgstr ""
-"\"%s\" listaf�jlj�nak vizsg�lata sikertelen; az adatforr�s nem ker�l "
-"feldolgoz�sra"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "t�l sok csatlakoztat�si pont ehhez a cser�lhet� adatforr�shoz: \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "t�bb csomag l�tezik azonos RPM f�jln�vvel: \"%s\""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "a cser�lhet� eszk�z a k�vetkez�nek lesz v�ve: \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "\"%s\" elemz�se sikertelen; a helytelen �rt�k: \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "elt�r� cser�lhet� eszk�z (\"%s\") haszn�lata ehhez: \"%s\""
+msgid "The following packages contain %s: %s"
+msgstr "A k�vetkez� csomagok tartalmazz�k a(z) %s komponenst: %s"
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "a k�vetkez� cser�lhet� adatforr�s �tvonala nem �rhet� el: \"%s\""
+msgid "no package named %s"
+msgstr "nincs ilyen nev� csomag: %s"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "a be�ll�t�sok ment�se nem siker�lt: \"%s\""
+msgid "error registering local packages"
+msgstr "hiba a helyi csomagok regisztr�l�sakor"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "a csomagf�jl nem �rhet� el: \"%s\""
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "RPM f�jlok behozatala..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "be�ll�t�sok ment�se: \"%s\""
+msgid "invalid rpm file name [%s]"
+msgstr "�rv�nytelen csomagf�jln�v: \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "\"%s\" elemz�se sikertelen a k�vetkez� f�jlban: \"%s\""
+msgid "no entries relocated in depslist"
+msgstr "egyetlen bejegyz�s sem ker�lt �thelyez�sre a f�gg�s�glist�ban"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "p�rhuzamoss�g vizsg�lata a k�vetkez� f�jlban: \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "bejegyz�sek �thelyezve a f�gg�s�glist�ban: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "p�rhuzamoss�g van defini�lva a k�vetkez� g�pekre: %s"
+msgid "unmounting %s"
+msgstr "%s lev�laszt�sa"
 
-#: ../urpm.pm_.c:780
-#, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "a hozz�rendelt adatforr�s haszn�lata p�rhuzamos m�dhoz: %s "
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "%s csatlakoztat�sa"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "\"%s\" p�rhuzamoss�gi opci� nem haszn�lhat�"
+msgid "removing %d obsolete headers in cache"
+msgstr "%d elavult fejl�c elt�vol�t�sa a gyorst�rb�l"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "a --synthesis nem haszn�lhat� ezekkel: --media, --update, --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "%d fejl�c tal�lhat� a gyorst�rban"
 
-#: ../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 "built hdlist synthesis file for medium \"%s\""
+msgstr "kiterjesztett f�gg�s�glista k�sz�t�se ehhez: \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "fejl�clista vizsg�lata: \"%s\""
 
-#: ../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]"
 msgstr "kiterjesztett f�gg�s�glista vizsg�lata: \"%s\""
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "probl�ma a(z) \"%s\" adatforr�s fejl�clist�j�nak olvas�sakor"
+msgid "building hdlist [%s]"
+msgstr "fejl�clista k�sz�t�se: \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "\"%s\" adatforr�s fejl�ceinek olvas�sa"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "f�gg�s�gek meghat�roz�sa - m�sodik l�p�s\n"
 
-#: ../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\""
 msgstr ""
 "probl�ma a(z) \"%s\" adatforr�s kiterjesztett f�gg�s�glist�j�nak olvas�sakor"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "az rpmdb megnyit�sa nem siker�lt"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" adatforr�s m�r l�tezik"
+msgid "nothing written in list file for \"%s\""
+msgstr "semmi nem ker�lt a listaf�jlba: \"%s\""
 
-#: ../urpm.pm_.c:918
-#, c-format
-msgid "added medium %s"
-msgstr "%s adatforr�s felv�ve"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "a(z) \"%s\" adatforr�shoz nem tal�lhat� fejl�clista (hdlist)"
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "az els� telep�t�si adatforr�s nem el�rhet�"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "a(z) \"%s\" listaf�jlja nem �rhat�"
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "fejl�clista m�sol�sa..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "A(z) \"%s\" f�jl m�r fel lett haszn�lva ugyanezen adatforr�son: \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...m�sol�s megt�rt�nt"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "fejl�clista nem elemezhet�: \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...m�sol�s megt�rt�nt"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "a(z) \"%s\" adatforr�shoz nem tal�lhat� fejl�clista (hdlist)"
 
-#: ../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 "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
-"az els� telep�t�si adatforr�s nem el�rhet� (Mandrake/base/hdlists f�jl nem "
-"tal�lhat�)"
+"a forr�s-fejl�clista (vagy a kiterjesztett f�gg�s�glista) beolvas�sa nem "
+"siker�lt"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "fejl�clista behozatala..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "fejl�clista vizsg�lata: \"%s\""
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...behozatal megt�rt�nt"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr ""
+"\"%s\" forr�s-fejl�clist�j�nak (illetve kiterjesztett f�gg�s�glist�j�nak) "
+"m�sol�sa..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...a behozatal sikertelen: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
+"\"%s\" forr�s-fejl�clist�j�nak (illetve kiterjesztett f�gg�s�glist�j�nak) "
+"behozatala..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "�rv�nytelen fejl�clista-le�r�s a fejl�clista-f�jlban: \"%s\""
+msgid "retrieving description file of \"%s\"..."
+msgstr "\"%s\" le�r�sf�jlj�nak behozatala..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "nem l�tez� adatforr�s: \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "csomagf�jlok (RPM) nem tal�lhat�k: \"%s\""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "csomagf�jlok (RPM) nem olvashat�k innen: \"%s\" - %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "t�bb adatforr�s kijel�l�se: \"%s\""
+msgid "reading rpm files from [%s]"
+msgstr "csomagf�jlok (RPM) olvas�sa innen: \"%s\""
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "\"%s\" adatforr�s elt�vol�t�sa"
+msgid "...copying done"
+msgstr "...m�sol�s megt�rt�nt"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "az urpmi adatb�zis z�rolt"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...m�sol�s megt�rt�nt"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "a(z) \"%s\" adatforr�s nem �rhet� el"
+msgid "copying source list of \"%s\"..."
+msgstr "\"%s\" forr�slist�j�nak m�sol�sa..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\" le�r�sf�jlj�nak m�sol�sa..."
+msgid "copy of [%s] failed"
+msgstr "a(z) \"%s\" m�sol�sa nem siker�lt"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 "\"%s\" forr�s-fejl�clist�j�nak (illetve kiterjesztett f�gg�s�glist�j�nak) "
 "m�sol�sa..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "a(z) \"%s\" m�sol�sa nem siker�lt"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\" le�r�sf�jlj�nak m�sol�sa..."
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "fejl�clista vizsg�lata: \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "\"%s\" adatforr�s elt�vol�t�sa"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "\"%s\" forr�slist�j�nak m�sol�sa..."
+msgid "selecting multiple media: %s"
+msgstr "t�bb adatforr�s kijel�l�se: \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "csomagf�jlok (RPM) olvas�sa innen: \"%s\""
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "csomagf�jlok (RPM) nem olvashat�k innen: \"%s\" - %s"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "nem l�tez� adatforr�s: \"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "csomagf�jlok (RPM) nem tal�lhat�k: \"%s\""
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"az els� telep�t�si adatforr�s nem el�rhet� (Mandrake/base/hdlists f�jl nem "
+"tal�lhat�)"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "\"%s\" le�r�sf�jlj�nak behozatala..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "�rv�nytelen fejl�clista-le�r�s a fejl�clista-f�jlban: \"%s\""
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr ""
-"\"%s\" forr�s-fejl�clist�j�nak (illetve kiterjesztett f�gg�s�glist�j�nak) "
-"behozatala..."
+msgid "retrieving hdlists file..."
+msgstr "fejl�clista behozatala..."
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-"a forr�s-fejl�clista (vagy a kiterjesztett f�gg�s�glista) beolvas�sa nem "
-"siker�lt"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying hdlists file..."
+msgstr "fejl�clista m�sol�sa..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "a(z) \"%s\" adatforr�shoz nem tal�lhat� fejl�clista (hdlist)"
+msgid "unable to access first installation medium"
+msgstr "az els� telep�t�si adatforr�s nem el�rhet�"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "A(z) \"%s\" f�jl m�r fel lett haszn�lva ugyanezen adatforr�son: \"%s\""
+msgid "added medium %s"
+msgstr "%s adatforr�s felv�ve"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "fejl�clista nem elemezhet�: \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" adatforr�s m�r l�tezik"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "a(z) \"%s\" listaf�jlja nem �rhat�"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "probl�ma a(z) \"%s\" adatforr�s fejl�clist�j�nak olvas�sakor"
 
-#: ../urpm.pm_.c:1526
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "a(z) \"%s\" adatforr�shoz nem tal�lhat� fejl�clista (hdlist)"
+#: ../urpm.pm:1
+#, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "a --synthesis nem haszn�lhat� ezekkel: --media, --update, --parallel"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "semmi nem ker�lt a listaf�jlba: \"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "\"%s\" p�rhuzamoss�gi opci� nem haszn�lhat�"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "f�gg�s�gek meghat�roz�sa - m�sodik l�p�s\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "a hozz�rendelt adatforr�s haszn�lata p�rhuzamos m�dhoz: %s "
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "\"%s\" adatforr�s fejl�ceinek olvas�sa"
+msgid "found parallel handler for nodes: %s"
+msgstr "p�rhuzamoss�g van defini�lva a k�vetkez� g�pekre: %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "fejl�clista k�sz�t�se: \"%s\""
+msgid "examining parallel handler in file [%s]"
+msgstr "p�rhuzamoss�g vizsg�lata a k�vetkez� f�jlban: \"%s\""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "kiterjesztett f�gg�s�glista k�sz�t�se ehhez: \"%s\""
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "\"%s\" elemz�se sikertelen a k�vetkez� f�jlban: \"%s\""
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d fejl�c tal�lhat� a gyorst�rban"
+msgid "write config file [%s]"
+msgstr "be�ll�t�sok ment�se: \"%s\""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "%d elavult fejl�c elt�vol�t�sa a gyorst�rb�l"
+msgid "unable to write config file [%s]"
+msgstr "a be�ll�t�sok ment�se nem siker�lt: \"%s\""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "%s csatlakoztat�sa"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "a k�vetkez� cser�lhet� adatforr�s �tvonala nem �rhet� el: \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "%s lev�laszt�sa"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "elt�r� cser�lhet� eszk�z (\"%s\") haszn�lata ehhez: \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "bejegyz�sek �thelyezve a f�gg�s�glist�ban: %s"
+msgid "taking removable device as \"%s\""
+msgstr "a cser�lhet� eszk�z a k�vetkez�nek lesz v�ve: \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "egyetlen bejegyz�s sem ker�lt �thelyez�sre a f�gg�s�glist�ban"
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "t�l sok csatlakoztat�si pont ehhez a cser�lhet� adatforr�shoz: \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "�rv�nytelen csomagf�jln�v: \"%s\""
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"\"%s\" listaf�jlj�nak vizsg�lata sikertelen; az adatforr�s nem ker�l "
+"feldolgoz�sra"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "RPM f�jlok behozatala..."
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+"hib�s listaf�jl a(z) \"%s\" adatforr�shoz; az adatforr�s nem ker�l "
+"feldolgoz�sra"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "a csomagf�jl nem �rhet� el: \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+"\"%s\" listaf�jlja nem tal�lhat�; az adatforr�s nem ker�l feldolgoz�sra"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "a csomagf�jl nem �rhet� el: \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+"\"%s\" fejl�clist�ja nem tal�lhat�; az adatforr�s nem ker�l feldolgoz�sra"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "hiba a helyi csomagok regisztr�l�sakor"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "a(z) \"%s\" n�ven l�tez� adatforr�s elker�l�se"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "nincs ilyen nev� csomag: %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "\"%s\" listaf�jlja nem el�rhet�; az adatforr�s nem ker�l feldolgoz�sra"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "A k�vetkez� csomagok tartalmazz�k a(z) %s komponenst: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
+"\"%s\" fejl�clist�ja nem el�rhet�; az adatforr�s nem ker�l feldolgoz�sra"
 
-#: ../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\""
-msgstr "t�bb csomag l�tezik azonos RPM f�jln�vvel: \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "a fejl�clist�hoz tartoz� adatforr�s nem hat�rozhat� meg: \"%s\""
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "\"%s\" elemz�se sikertelen; a helytelen �rt�k: \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"a(z) \"%s\" adatforr�s nem vehet� figyelembe, mivel \"%s\" listaf�jl nem "
+"l�tezik"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "\"%s\" n�v nem adhat� az adatforr�snak, mivel m�r van ilyen n�v"
 
-#: ../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)"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"a(z) \"%s\" adatforr�s nem kezelhet�, mivel a listaf�jlt m�r haszn�lja egy "
+"m�sik adatforr�s"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
+"a(z) \"%s\" adatforr�s egy haszn�latban lev� list�t pr�b�lt haszn�lni; az "
+"adatforr�s nem ker�l feldolgoz�sra"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "a csomag nem tal�lhat�: \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"a(z) \"%s\" adatforr�s egy haszn�latban lev� fejl�clist�t pr�b�lt haszn�lni; "
+"az adatforr�s nem ker�l feldolgoz�sra"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "a(z) \"%s\" adatforr�s nincs kijel�lve"
+msgid "syntax error in config file at line %s"
+msgstr "szintaktikai hiba a konfigur�ci�s f�jl k�vetkez� sor�ban: %s"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "a(z) \"%s\" csomagf�jl (RPM) nem olvashat� a(z) \"%s\" adatforr�sb�l"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s %%; sebess�g: %s"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "a(z) \"%s\" hib�s adatforr�s cser�lhet�nek van jel�lve, pedig nem az"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s %% ebb�l: %s; h�tralev�: %s; sebess�g: %s"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "hib�s bevitel: \"%s\""
-
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "RPM f�jlok behozatala..."
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "az rsync hib�val l�pett ki: \"%d\" hibak�d vagy \"%d\" szign�l\n"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "El�k�sz�t�s..."
-
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "a(z) \"%s\" csomag elt�vol�t�sa sikertelen"
+msgid "ssh is missing\n"
+msgstr "az ssh nem tal�lhat�\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "a(z) \"%s\" csomag telep�t�se sikertelen"
+msgid "rsync is missing\n"
+msgstr "az rsync nem tal�lhat�\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s sz�ks�ges ehhez: %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "a curl hib�val l�pett ki: \"%d\" hibak�d vagy \"%d\" szign�l\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �tk�zik ezzel: %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 "az mput nem siker�lt - lehets�ges, hogy egy g�p nem el�rhet�"
-
-#: ../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 "az rshp nem siker�lt - lehets�ges, hogy egy g�p nem el�rhet�"
+msgid "curl is missing\n"
+msgstr "a curl nem tal�lhat�\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "ezen a g�pen: %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "a wget hib�val l�pett ki: \"%d\" hibak�d vagy \"%d\" szign�l\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 "A telep�t�s nem siker�lt ezen a g�pen: %s"
+msgid "wget is missing\n"
+msgstr "a wget nem tal�lhat�\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 "A telep�t�s elv�gezhet�"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "a m�sol�s sikertelen: %s"
 
-#: ../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 "az scp nem siker�lt ezen a g�pen: %s"
+msgid "unable to handle protocol: %s"
+msgstr "protokollkezel�s sikertelen: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "nem megfelel� urpmi-verzi� a k�vetkez� g�pen: %s"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "nem tal�lhat� webes let�lt�program (curl vagy wget)\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 %s\n"
-"Copyright (C) MandrakeSoft, 1999, 2000, 2001, 2002.\n"
-"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�.\n"
-"\n"
-"Haszn�lat:\n"
+msgid "unknown protocol defined for %s"
+msgstr "ismeretlen protokoll van defini�lva ehhez: \"%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         - jelen seg�ts�g megjelen�t�se\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Ismeretlen let�lt�program: \"%s\".\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - v�laszt�si lehet�s�gn�l automatikusan v�laszt csomagot\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Az elt�vol�t�s sikertelen"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - annak ellen�rz�se, hogy a telep�t�s v�grehajthat�-e\n"
+"A f�gg�s�gek felold�s�hoz a k�vetkez� csomagokat el fogom t�vol�tani (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - elosztott urpmi t�bb sz�m�t�g�p k�zt\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Ellen�rz�s a k�vetkez� csomagok elt�vol�t�s�hoz"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - a mint�ra illeszked� csomagok kijel�l�se\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nincs mit elt�vol�tani"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpme: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket\n"
-"a --help param�ter megad�s�val lehet kilist�zni.\n"
+msgid "removing package %s will break your system"
+msgstr "a(z) \"%s\" csomag elt�vol�t�sa t�nkreteheti a rendszert"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "ismeretlen csomag"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "ismeretlen csomagok"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "a(z) \"%s\" csomag elt�vol�t�sa t�nkreteheti a rendszert"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpme: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket\n"
+"a --help param�ter megad�s�val lehet kilist�zni.\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Nincs mit elt�vol�tani"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - a mint�ra illeszked� csomagok kijel�l�se\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Ellen�rz�s a k�vetkez� csomagok elt�vol�t�s�hoz"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - elosztott urpmi t�bb sz�m�t�g�p k�zt\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"A f�gg�s�gek felold�s�hoz a k�vetkez� csomagokat el fogom t�vol�tani (%d MB)"
+"  --test         - annak ellen�rz�se, hogy a telep�t�s v�grehajthat�-e\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Az elt�vol�t�s sikertelen"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - v�laszt�si lehet�s�gn�l automatikusan v�laszt csomagot\n"
 
-#: ../urpmf_.c:26
+#: ../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         - jelen seg�ts�g megjelen�t�se\n"
+
+#: ../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 %s\n"
-"Copyright (C) MandrakeSoft, 2002.\n"
+"urpme %s\n"
+"Copyright (C) MandrakeSoft, 1999, 2000, 2001, 2002.\n"
 "Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�.\n"
 "\n"
 "Haszn�lat:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - csak friss�t�si adatforr�s legyen haszn�lva\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"callback:\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"  --media        - csak a felsorolt (elv�laszt�s: vessz�) adatforr�sok\n"
-"                   haszn�lata\n"
+"  )              - z�r�jelp�r z�r� r�sze; kifejez�sek csoportos�t�s�hoz\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"  --synthesis    - a megadott kiterjesztett f�gg�s�glista haszn�lata az\n"
-"                   urpmi-adatb�zis helyett\n"
+"  (              - z�r�jelp�r nyit� r�sze; kifejez�sek csoportos�t�s�hoz\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - r�szletes inform�ci�\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
+"  !              - un�ris NEM m�velet: akkor igaz, ha a kifejez�s hamis\n"
 
-# maxim�lis sorhossz: 80 karakter (karakteres termin�l sorhossza)
-# "." ne legyen a sztringek v�g�n
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet        - c�mke ki�r�s�nak elhagy�sa (ha nincs c�mke a "
-"parancssorban,\n"
-"                   akkor ez l�p �letbe; interakt�v m�dban nem haszn�lhat�)\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - az �sszes adat megjelen�t�se\n"
+"  -o             - bin�ris VAGY m�velet: akkor igaz, ha legal�bb\n"
+"                   az egyik kifejez�s igaz\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name         - n�v megjelen�t�se (ha nincs megadva c�mke a "
-"parancssorban,\n"
-"                   akkor automatikusan �letbe l�p)\n"
+"  -a             - bin�ris �S m�velet: akkor igaz, ha mindk�t kifejez�s "
+"igaz\n"
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - csoport megjelen�t�se\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - Perl k�d k�zvetlen betev�se (perl -e)\n"
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - m�ret megjelen�t�se\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - a n�vvel egy�tt a verzi�, a kiad�ssz�m �s az\n"
+"                   architekt�ra is jelenjen meg\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - gener�ci� megjelen�t�se\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - a mint�k feldolgoz�sa nem nagybet��rz�keny\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - �sszefoglal� megjelen�t�se\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr "  --obsoletes    - t�lhaladott csomagok megjelen�t�se (t�bb sor)\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - le�r�s megjelen�t�se\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr "  --conflicts    - �tk�z�sek megjelen�t�se (t�bb sor)\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr "  --provides     - szolg�ltat�sjegyz�k megjelen�t�se (t�bb sor)\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files        - f�jlnevek megjelen�t�se (t�bb sor)\n"
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr "  --requires     - k�vetelm�nyek megjelen�t�se (t�bb sor)\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files        - f�jlnevek megjelen�t�se (t�bb sor)\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+msgstr "  --provides     - szolg�ltat�sjegyz�k megjelen�t�se (t�bb sor)\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr "  --conflicts    - �tk�z�sek megjelen�t�se (t�bb sor)\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - le�r�s megjelen�t�se\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr "  --obsoletes    - t�lhaladott csomagok megjelen�t�se (t�bb sor)\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - �sszefoglal� megjelen�t�se\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - a mint�k feldolgoz�sa nem nagybet��rz�keny\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - gener�ci� megjelen�t�se\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - a n�vvel egy�tt a verzi�, a kiad�ssz�m �s az\n"
-"                   architekt�ra is jelenjen meg\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - m�ret megjelen�t�se\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - Perl k�d k�zvetlen betev�se (perl -e)\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - csoport megjelen�t�se\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - bin�ris �S m�velet: akkor igaz, ha mindk�t kifejez�s "
-"igaz\n"
+"  --name         - n�v megjelen�t�se (ha nincs megadva c�mke a "
+"parancssorban,\n"
+"                   akkor automatikusan �letbe l�p)\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - az �sszes adat megjelen�t�se\n"
+
+# maxim�lis sorhossz: 80 karakter (karakteres termin�l sorhossza)
+# "." ne legyen a sztringek v�g�n
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - bin�ris VAGY m�velet: akkor igaz, ha legal�bb\n"
-"                   az egyik kifejez�s igaz\n"
+"  --quiet        - c�mke ki�r�s�nak elhagy�sa (ha nincs c�mke a "
+"parancssorban,\n"
+"                   akkor ez l�p �letbe; interakt�v m�dban nem haszn�lhat�)\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  !              - un�ris NEM m�velet: akkor igaz, ha a kifejez�s hamis\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - r�szletes inform�ci�\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  (              - z�r�jelp�r nyit� r�sze; kifejez�sek csoportos�t�s�hoz\n"
+"  --synthesis    - a megadott kiterjesztett f�gg�s�glista haszn�lata az\n"
+"                   urpmi-adatb�zis helyett\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  )              - z�r�jelp�r z�r� r�sze; kifejez�sek csoportos�t�s�hoz\n"
+"  --media        - csak a felsorolt (elv�laszt�s: vessz�) adatforr�sok\n"
+"                   haszn�lata\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"callback:\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - csak friss�t�si adatforr�s legyen haszn�lva\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"Haszn�lat: urpmi.addmedia [opci�k] <n�v> <URL> [with <relat�v_�tvonal>]\n"
-"ahol <URL> az al�bbiak egyike lehet:\n"
-"       file://<el�r�si �t>\n"
-"       ftp://<felhaszn�l�n�v>:<jelsz�>@<g�pn�v>/<el�r�si �t> with <a "
-"fejl�clista relat�v f�jlneve>\n"
-"       ftp://<g�pn�v>/<el�r�si �t> with <a fejl�clista relat�v f�jlneve>\n"
-"       http://<g�pn�v>/<el�r�si �t> with <a fejl�clista relat�v f�jlneve>\n"
-"       removable://<el�r�si �t>\n"
+"urpmf %s\n"
+"Copyright (C) MandrakeSoft, 2002.\n"
+"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�.\n"
 "\n"
-"az [opci�k] pedig a k�vetkez�k lehetnek:\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         - a wget haszn�lata t�voli f�jlok let�lt�s�re\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         - a curl haszn�lata t�voli f�jlok let�lt�s�re\n"
+"Haszn�lat:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - a let�lt�si sebess�g korl�toz�sa\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "M�r minden telep�tve van"
 
-#: ../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        - a megadott HTTP proxy haszn�lata; a portsz�m "
-"alap�rtelmez�s\n"
-"                   szerint 1080 (form�tum: <proxyg�p[:port]>)\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "A telep�t�s elv�gezhet�"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - proxyhoz haszn�land� felhaszn�l�n�v �s jelsz�\n"
-"                   (form�tum: <felhaszn�l�n�v:jelsz�>)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "A telep�t�s nem siker�lt"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - friss�t�si adatforr�s l�trehoz�sa\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Mindenk�ppen megk�s�reljem a telep�t�st (--force)? (i/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - az �sszes adatforr�s l�trehoz�sa telep�t�si "
-"adatforr�sb�l\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�b�ljam meg a telep�t�st a f�gg�s�gek ellen�rz�se n�lk�l? (i/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  - adatforr�s automatikus l�trehoz�sa egy disztrib�ci� XXX\n"
-"                   r�sz�hez; az XXX lehets�ges �rt�kei: main, contrib,\n"
-"                   updates, vagy b�rmi, ami be lett �ll�tva\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "%s eloszt�sa\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --from         - a megadott URL �ltal azonos�tott f�jl haszn�lata\n"
-"                   t�k�rkiszolg�l�-listak�nt; alap�rtelmez�s: %s\n"
+"A telep�t�s nem siker�lt, mivel bizonyos f�jlok hi�nyoznak:\n"
+"%s\n"
+"�rdemes lehet friss�teni az urpmi adatb�zist."
 
-#: ../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"
-msgstr ""
-"  --version      - a megadott disztrib�ci�verzi� haszn�lata - az\n"
-"                   alap�rtelmez�s a telep�tett mandrake-release csomag "
-"�ltal\n"
-"                   megadott verzi�\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (i/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - a megadott architekt�ra haszn�lata - az alap�rtelmez�s a\n"
-"                   telep�tett mandrake-release csomag �ltal megadott\n"
-"                   architekt�ra\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Szeretn� folytatni a telep�t�st?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - a fejl�cgyorst�r k�nyvt�r�nak ki�r�t�se\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "A k�vetkez� csomagok helytelen al��r�st tartalmaznak:"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - kiterjesztett f�gg�s�glista illetve fejl�clista keres�se\n"
-"                   �s haszn�lata\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Amikor elk�sz�lt, nyomja le az Enter billenty�t..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - fejl�clista-f�jlok l�trehoz�s�nak kik�nyszer�t�se\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Helyezze be a(z) \"%s\" nev� adathordoz�t a(z) \"%s\" meghajt�ba"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "egy Cooker disztrib�ci� friss�t�sei nem vehet�k fel\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "a forr�scsomagok nem �rhet�k el, ez�rt a m�velet f�lbeszakad"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"<a fejl�clista relat�v �tvonala> --distrib eset�n sz�ks�gtelen"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "a(z) \"%s\" adatforr�s friss�t�se nem siker�lt\n"
+"A f�gg�s�gek felold�s�hoz a k�vetkez� csomagokat fogom telep�teni (%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"A k�vetkez� f�gg�s�gek telep�t�s�hez rendszergazdai jogosults�g sz�ks�ges:\n"
 "%s\n"
-"<a fejl�clista relat�v �tvonala> hi�nyzik\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 ""
+"A k�vetkez� csomagokat el kell t�vol�tani a friss�t�s el�tt:\n"
 "%s\n"
-"hi�nyz� \"with\" param�ter az FTP-s c�mn�l\n"
+"Egyet�rt ezzel?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "a(z) \"%s\" adatforr�s l�trehoz�sa nem siker�lt\n"
+msgid "unrequested"
+msgstr "nem volt k�rve"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"Haszn�lat: urpmi.removemedia [-a] <n�v> ...\n"
-"ahol <n�v> az elt�vol�tand� adatforr�s neve.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "ezzel val� �tk�z�s miatt: \"%s\""
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - az �sszes adatforr�s kijel�l�se\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "\"%s\" hi�nya miatt"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ismeretlen opci�k: \"%s\"\n"
+msgid "due to unsatisfied %s"
+msgstr "\"%s\" ig�nyei miatt"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"nincs mit elt�vol�tani (haszn�lja az urpmi.addmedia parancsot adatforr�s "
-"felv�tel�hez)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "\"%s\" telep�t�se �rdek�ben"
 
-#: ../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 ""
-"a t�rlend� bejegyz�s hi�nyzik\n"
-"(valamelyik ezek k�z�l: %s)\n"
+"A k�rt csomagok k�z�l n�h�nyat nem lehet telep�teni:\n"
+"%s\n"
+"Egyet�rt ezzel?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"Haszn�lat: urpmi.update [opci�k] <n�v> ...\n"
-"ahol <n�v> a friss�tend� adatforr�s neve.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ezt nem lehet v�lasztani, pr�b�lja meg �jra\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - csak friss�t�si adatforr�s legyen friss�tve\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Melyiket v�lasztja? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - az �sszes nem cser�lhet� adatforr�s kijel�l�se\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "A k�vetkez� csomagok valamelyik�re sz�ks�g van:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d             - teljes depslist.ordered f�jl k�sz�t�se\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "A k�vetkez� csomagok valamelyik�re sz�ks�g van a(z) %s telep�t�s�hez:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"nincs mit friss�teni (haszn�lja az urpmi.addmedia parancsot adatforr�s "
-"felv�tel�hez)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Csomagok telep�t�s�hez rendszergazdai jogosults�g sz�ks�ges"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"a friss�tend� bejegyz�s hi�nyzik\n"
-"(valamelyik ezek k�z�l: %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "a k�vetkez� k�rnyezet haszn�lata: %s\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 ""
-"urpmi %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�.\n"
-"\n"
-"Haszn�lat:\n"
+"A k�vetkez� k�nyvt�rnak a hibajelent�s c�lj�b�l val� l�trehoz�sa sikertelen: "
+"\"%s\""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - a megadott kiterjesztett f�gg�s�glista haszn�lata az\n"
-"                   urpmi-adatb�zis helyett\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Mit lehet tenni bin�ris RPM f�jlokkal, ha --install-src van megadva"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"  --auto-select  - automatikusan kiv�lasztja a friss�thet� csomagokat\n"
+"urpmi: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket\n"
+"a --help param�ter megad�s�val lehet kilist�zni.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - fuzzy keres�s haszn�lata (-y opci�val azonos)\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "helytelen proxy-megad�s a parancssorban\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --src          - a k�vetkez� csomag egy forr�scsomag (-s opci�val azonos)\n"
+"  a parancssorban megadott csomagok illetve RPM f�jlok lesznek telep�tve\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - csak a forr�scsomag telep�t�se (a programok mell�z�se)\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - r�szletes inform�ci�\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - n�ma �zemm�d\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --clean        - RPM f�jl elt�vol�t�sa a gyorst�rb�l a m�veletek el�tt\n"
+"  -s             - a k�vetkez� csomag egy forr�scsomag (--src opci�val "
+"azonos)\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
-"  --noclean      - a nem haszn�lt RPM f�jlok maradjanak a gyorst�rban\n"
+"  -y             - fuzzy keres�s haszn�lata (--fuzzy opci�val azonos)\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
-"  --force        - v�grehajt�s akkor is, ha n�h�ny csomag nem �rhet� el\n"
+"  -P             - a csomag ne legyen keresve a szolg�ltat�sjegyz�kben\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - csomag keres�se a szolg�ltat�sjegyz�kben\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - kijel�l�s a parancssorban megadott minta szerint\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
-"  --allow-nodeps - lehet�v� teszi a csomagok f�gg�s�gellen�rz�s n�lk�li\n"
-"                   telep�t�s�t (a felhaszn�l�t�l �rkez� meger�s�t�st "
-"k�vet�en)\n"
+"  --excludepath  - bizonyos �tvonalak (elv�laszt�s: vessz�) kihagy�sa\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  - lehet�v� teszi a csomagok f�gg�s�g- �s "
-"helyess�gellen�rz�s\n"
-"                   n�lk�li telep�t�s�t (a felhaszn�l�t�l �rkez� "
-"meger�s�t�st\n"
-"                   k�vet�en)\n"
+"  --verify-rpm   - RPM-al��r�s ellen�rz�se telep�t�s el�tt (alap�rtelmez�s:\n"
+"                   bekapcsolt �llapot; kikapcsol�s: --no-verify-rpm)\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          - hibajelent�s �r�sa a k�vetkez� argumentumban megadott\n"
-"                   k�nyvt�rba\n"
+"  --best-output  - a lehet�s�gek k�z�l a legmegfelel�bb fel�letet\n"
+"                   haszn�lja a program: grafikus (X) vagy karakteres\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - futtat�s az X grafikus fel�leten\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1194,453 +1311,506 @@ msgstr ""
 "  --env          - megadott k�rnyezet haszn�lata (�ltal�ban hibajelent�s\n"
 "                   eset�ben)\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - futtat�s az X grafikus fel�leten\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  - a lehet�s�gek k�z�l a legmegfelel�bb fel�letet\n"
-"                   haszn�lja a program: grafikus (X) vagy karakteres\n"
+"  --bug          - hibajelent�s �r�sa a k�vetkez� argumentumban megadott\n"
+"                   k�nyvt�rba\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-al��r�s ellen�rz�se telep�t�s el�tt (alap�rtelmez�s:\n"
-"                   bekapcsolt �llapot; kikapcsol�s: --no-verify-rpm)\n"
+"  --proxy-user   - proxyhoz haszn�land� felhaszn�l�n�v �s jelsz�\n"
+"                   (form�tum: <felhaszn�l�n�v:jelsz�>)\n"
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\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 ""
-"  --excludepath  - bizonyos �tvonalak (elv�laszt�s: vessz�) kihagy�sa\n"
+"  --proxy        - a megadott HTTP proxy haszn�lata; a portsz�m "
+"alap�rtelmez�s\n"
+"                   szerint 1080 (form�tum: <proxyg�p[:port]>)\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - kijel�l�s a parancssorban megadott minta szerint\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - a let�lt�si sebess�g korl�toz�sa\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - csomag keres�se a szolg�ltat�sjegyz�kben\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - a curl haszn�lata t�voli f�jlok let�lt�s�re\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - a csomag ne legyen keresve a szolg�ltat�sjegyz�kben\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - a wget haszn�lata t�voli f�jlok let�lt�s�re\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -y             - fuzzy keres�s haszn�lata (--fuzzy opci�val azonos)\n"
+"  --allow-force  - lehet�v� teszi a csomagok f�gg�s�g- �s "
+"helyess�gellen�rz�s\n"
+"                   n�lk�li telep�t�s�t (a felhaszn�l�t�l �rkez� "
+"meger�s�t�st\n"
+"                   k�vet�en)\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -s             - a k�vetkez� csomag egy forr�scsomag (--src opci�val "
-"azonos)\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - n�ma �zemm�d\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - r�szletes inform�ci�\n"
+"  --allow-nodeps - lehet�v� teszi a csomagok f�gg�s�gellen�rz�s n�lk�li\n"
+"                   telep�t�s�t (a felhaszn�l�t�l �rkez� meger�s�t�st "
+"k�vet�en)\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"  a parancssorban megadott csomagok illetve RPM f�jlok lesznek telep�tve\n"
+"  --force        - v�grehajt�s akkor is, ha n�h�ny csomag nem �rhet� el\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
-"urpmi: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket\n"
-"a --help param�ter megad�s�val lehet kilist�zni.\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Mit lehet tenni bin�ris RPM f�jlokkal, ha --install-src van megadva"
+"  --noclean      - a nem haszn�lt RPM f�jlok maradjanak a gyorst�rban\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
-"A k�vetkez� k�nyvt�rnak a hibajelent�s c�lj�b�l val� l�trehoz�sa sikertelen: "
-"\"%s\""
+"  --clean        - RPM f�jl elt�vol�t�sa a gyorst�rb�l a m�veletek el�tt\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "a k�vetkez� k�rnyezet haszn�lata: %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Csomagok telep�t�s�hez rendszergazdai jogosults�g sz�ks�ges"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - csak a forr�scsomag telep�t�se (a programok mell�z�se)\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "A k�vetkez� csomagok valamelyik�re sz�ks�g van a(z) %s telep�t�s�hez:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "A k�vetkez� csomagok valamelyik�re sz�ks�g van:"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - a k�vetkez� csomag egy forr�scsomag (-s opci�val azonos)\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Melyiket v�lasztja? (1-%d) "
-
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ezt nem lehet v�lasztani, pr�b�lja meg �jra\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - fuzzy keres�s haszn�lata (-y opci�val azonos)\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"A k�rt csomagok k�z�l n�h�nyat nem lehet telep�teni:\n"
-"%s\n"
-"Egyet�rt ezzel?"
+"  --auto-select  - automatikusan kiv�lasztja a friss�thet� csomagokat\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "\"%s\" telep�t�se �rdek�ben"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - a megadott kiterjesztett f�gg�s�glista haszn�lata az\n"
+"                   urpmi-adatb�zis helyett\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "\"%s\" ig�nyei miatt"
+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 %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�.\n"
+"\n"
+"Haszn�lat:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "\"%s\" hi�nya miatt"
+msgid "unable to update medium \"%s\"\n"
+msgstr "a(z) \"%s\" adatforr�s friss�t�se nem siker�lt\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "ezzel val� �tk�z�s miatt: \"%s\""
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "nem volt k�rve"
+msgid "unable to create medium \"%s\"\n"
+msgstr "a(z) \"%s\" adatforr�s l�trehoz�sa nem siker�lt\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 ""
-"A k�vetkez� csomagokat el kell t�vol�tani a friss�t�s el�tt:\n"
 "%s\n"
-"Egyet�rt ezzel?"
+"hi�nyz� \"with\" param�ter az FTP-s c�mn�l\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"A f�gg�s�gek felold�s�hoz a k�vetkez� csomagokat fogom telep�teni (%d MB)"
+"%s\n"
+"<a fejl�clista relat�v �tvonala> hi�nyzik\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 ""
-"A k�vetkez� f�gg�s�gek telep�t�s�hez rendszergazdai jogosults�g sz�ks�ges:\n"
 "%s\n"
+"<a fejl�clista relat�v �tvonala> --distrib eset�n sz�ks�gtelen"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "a forr�scsomagok nem �rhet�k el, ez�rt a m�velet f�lbeszakad"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "RPM f�jlok behozatala..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s %% ebb�l: %s; h�tralev�: %s; sebess�g: %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "egy Cooker disztrib�ci� friss�t�sei nem vehet�k fel\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s %%; sebess�g: %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ismeretlen opci�k: \"%s\"\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Helyezze be a(z) \"%s\" nev� adathordoz�t a(z) \"%s\" meghajt�ba"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Amikor elk�sz�lt, nyomja le az Enter billenty�t..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "A k�vetkez� csomagok helytelen al��r�st tartalmaznak:"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - fejl�clista-f�jlok l�trehoz�s�nak kik�nyszer�t�se\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Szeretn� folytatni a telep�t�st?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - kiterjesztett f�gg�s�glista illetve fejl�clista keres�se\n"
+"                   �s haszn�lata\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (i/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - a fejl�cgyorst�r k�nyvt�r�nak ki�r�t�se\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 ""
-"A telep�t�s nem siker�lt, mivel bizonyos f�jlok hi�nyoznak:\n"
-"%s\n"
-"�rdemes lehet friss�teni az urpmi adatb�zist."
+"  --arch         - a megadott architekt�ra haszn�lata - az alap�rtelmez�s a\n"
+"                   telep�tett mandrake-release csomag �ltal megadott\n"
+"                   architekt�ra\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "A telep�t�s nem siker�lt"
+#: ../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      - a megadott disztrib�ci�verzi� haszn�lata - az\n"
+"                   alap�rtelmez�s a telep�tett mandrake-release csomag "
+"�ltal\n"
+"                   megadott verzi�\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "%s eloszt�sa\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - a megadott URL �ltal azonos�tott f�jl haszn�lata\n"
+"                   t�k�rkiszolg�l�-listak�nt; alap�rtelmez�s: %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pr�b�ljam meg a telep�t�st a f�gg�s�gek ellen�rz�se n�lk�l? (i/N) "
+#: ../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  - adatforr�s automatikus l�trehoz�sa egy disztrib�ci� XXX\n"
+"                   r�sz�hez; az XXX lehets�ges �rt�kei: main, contrib,\n"
+"                   updates, vagy b�rmi, ami be lett �ll�tva\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Mindenk�ppen megk�s�reljem a telep�t�st (--force)? (i/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - az �sszes adatforr�s l�trehoz�sa telep�t�si "
+"adatforr�sb�l\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "M�r minden telep�tve van"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - friss�t�si adatforr�s l�trehoz�sa\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 %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�.\n"
+"Haszn�lat: urpmi.addmedia [opci�k] <n�v> <URL> [with <relat�v_�tvonal>]\n"
+"ahol <URL> az al�bbiak egyike lehet:\n"
+"       file://<el�r�si �t>\n"
+"       ftp://<felhaszn�l�n�v>:<jelsz�>@<g�pn�v>/<el�r�si �t> with <a "
+"fejl�clista relat�v f�jlneve>\n"
+"       ftp://<g�pn�v>/<el�r�si �t> with <a fejl�clista relat�v f�jlneve>\n"
+"       http://<g�pn�v>/<el�r�si �t> with <a fejl�clista relat�v f�jlneve>\n"
+"       removable://<el�r�si �t>\n"
 "\n"
-"Haszn�lat:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - az el�rhet� csomagok list�z�sa\n"
+"az [opci�k] pedig a k�vetkez�k lehetnek:\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - az el�rhet� adatforr�sok list�z�sa\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"a t�rlend� bejegyz�s hi�nyzik\n"
+"(valamelyik ezek k�z�l: %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"  --list-nodes   - az el�rhet� g�pek list�z�sa --parallel haszn�lata eset�n\n"
+"nincs mit elt�vol�tani (haszn�lja az urpmi.addmedia parancsot adatforr�s "
+"felv�tel�hez)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - az el�rhet� p�rhuzamos aliasok list�z�sa\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - az �sszes adatforr�s kijel�l�se\n"
 
-#: ../urpmq_.c:51
+#: ../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      - a csomagok urpmi-adatb�zisban t�rolt fejl�ceinek ki�r�sa\n"
-"                   a standard kimenetre (stdout) - a m�velethez\n"
-"                   rendszergazdai jogosults�g sz�ks�ges\n"
+"Haszn�lat: urpmi.removemedia [-a] <n�v> ...\n"
+"ahol <n�v> az elt�vol�tand� adatforr�s neve.\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      - a csomagok el�r�si �tj�nak list�z�sa let�lt�s el�tt\n"
-"                   (rendszergazdai jogosults�g sz�ks�ges)\n"
+"a friss�tend� bejegyz�s hi�nyzik\n"
+"(valamelyik ezek k�z�l: %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - a lek�rdez�s terjedjen ki a csomagf�gg�s�gekre is\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nincs mit friss�teni (haszn�lja az urpmi.addmedia parancsot adatforr�s "
+"felv�tel�hez)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - csomag kihagy�sa, ha m�r van �jabb verzi� telep�tve\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d             - teljes depslist.ordered f�jl k�sz�t�se\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - az �sszes nem cser�lhet� adatforr�s kijel�l�se\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - csak friss�t�si adatforr�s legyen friss�tve\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  -c             - teljes inform�ci�, az elt�vol�tand� csomaggal egy�tt\n"
+"Haszn�lat: urpmi.update [opci�k] <n�v> ...\n"
+"ahol <n�v> a friss�tend� adatforr�s neve.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - ford�tott keres�s: mi ig�nyli a csomagot\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "a --list-nodes csak a --parallel opci�val haszn�lhat�"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - a n�vvel egy�tt a csoportok is jelenjenek meg\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: egy RPM f�jl nem olvashat�: \"%s\"\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"  -r             - a n�vvel egy�tt a verzi� �s a kiad�ssz�m is jelenjen meg\n"
+"urpmq: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket a --help "
+"param�ter megad�s�val lehet kilist�zni.\n"
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  a parancssorban megadott csomagok illetve RPM f�jlok lesznek lek�rdezve\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "a --list-nodes csak a --parallel opci�val haszn�lhat�"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr ""
+"  -r             - a n�vvel egy�tt a verzi� �s a kiad�ssz�m is jelenjen meg\n"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf %s"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - a n�vvel egy�tt a csoportok is jelenjenek meg\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) MandrakeSoft, 1999, 2000, 2001, 2002"
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - ford�tott keres�s: mi ig�nyli a csomagot\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
-"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�."
-
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "Haszn�lat: urpmf [opci�k] <f�jl>"
+"  -c             - teljes inform�ci�, az elt�vol�tand� csomaggal egy�tt\n"
 
-# maxim�lis sorhossz: 80 karakter (karakteres termin�l sorhossza)
-# "." ne legyen a sztringek v�g�n
-#: placeholder.h:22
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - c�mke ki�r�s�nak elhagy�sa (ha nincs c�mke a "
-"parancssorban,"
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"                    akkor ez l�p �letbe; interakt�v m�dban nem haszn�lhat�)"
+"  -u             - csomag kihagy�sa, ha m�r van �jabb verzi� telep�tve\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - az �sszes adat megjelen�t�se"
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - a lek�rdez�s terjedjen ki a csomagf�gg�s�gekre is\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --name          - n�v megjelen�t�se (ha nincs megadva c�mke a "
-"parancssorban,"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    akkor automatikusan �letbe l�p)"
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - csoport megjelen�t�se"
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - m�ret megjelen�t�se"
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - sorozatsz�m megjelen�t�se"
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - �sszefoglal� megjelen�t�se"
+"  --sources      - a csomagok el�r�si �tj�nak list�z�sa let�lt�s el�tt\n"
+"                   (rendszergazdai jogosults�g sz�ks�ges)\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - le�r�s megjelen�t�se"
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - a csomagok urpmi-adatb�zisban t�rolt fejl�ceinek ki�r�sa\n"
+"                   a standard kimenetre (stdout) - a m�velethez\n"
+"                   rendszergazdai jogosults�g sz�ks�ges\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - szolg�ltat�sjegyz�k megjelen�t�se (t�bb sor)"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - az el�rhet� p�rhuzamos aliasok list�z�sa\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - k�vetelm�nyek megjelen�t�se (t�bb sor)"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - az el�rhet� g�pek list�z�sa --parallel haszn�lata eset�n\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - f�jlnevek megjelen�t�se (t�bb sor)"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - az el�rhet� adatforr�sok list�z�sa\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr "  --conflicts     - �tk�z�sek megjelen�t�se (t�bb sor)"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - az el�rhet� csomagok list�z�sa\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr "  --obsoletes     - t�lhaladott csomagok megjelen�t�se (t�bb sor)"
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - el�felt�telek megjelen�t�se (t�bb sor)"
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "tov�bbi opci�k�rt pr�b�lja meg az \"urpmf --help\" parancsot"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "teljes adatforr�slista nem tal�lhat�"
+"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 ""
+"urpmq %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�.\n"
+"\n"
+"Haszn�lat:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "a curl hib�val l�pett ki: \"%d\" hibak�d vagy \"%d\" szign�l\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "A telep�t�s nem siker�lt ezen a g�pen: %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "az rsync nem tal�lhat�\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "az rshp nem siker�lt - lehets�ges, hogy egy g�p nem el�rhet�"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "az rsync hib�val l�pett ki: \"%d\" hibak�d vagy \"%d\" szign�l\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "az mput nem siker�lt - lehets�ges, hogy egy g�p nem el�rhet�"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "az ssh nem tal�lhat�\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "ezen a g�pen: %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "szintaktikai hiba a konfigur�ci�s f�jl k�vetkez� sor�ban: %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "az scp nem siker�lt ezen a g�pen: %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "a(z) \"%s\" adatforr�s egy haszn�latban lev� fejl�clist�t pr�b�lt "
-#~ "haszn�lni; az adatforr�s nem ker�l feldolgoz�sra"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "nem megfelel� urpmi-verzi� a k�vetkez� g�pen: %s"
 
 #~ msgid "Remove them all?"
 #~ msgstr "El szeretn� mindet t�vol�tani?"
@@ -1665,14 +1835,6 @@ msgstr "teljes adatforr�slista nem tal�lhat�"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - jelen seg�ts�g megjelen�t�se\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr ""
-#~ "urpmq: ismeretlen param�ter: \"-%s\". A lehets�ges param�tereket a --help "
-#~ "param�ter megad�s�val lehet kilist�zni.\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: egy RPM f�jl nem olvashat�: \"%s\"\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr ""
 #~ "nem k�sz�thet� kiterjesztett f�gg�s�glista ehhez az adatforr�shoz: \"%s\""
@@ -1762,9 +1924,6 @@ msgstr "teljes adatforr�slista nem tal�lhat�"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) MandrakeSoft, 1999, 2000, 2001"
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "helytelen proxy-megad�s a parancssorban\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr ""
 #~ "Haszn�lat: urpmi.addmedia [opci�k] <n�v> <URL> [with <relat�v_�tvonal>]"
diff --git a/po/id.po b/po/id.po
index ca1fcdec..4df2dcb4 100644
--- a/po/id.po
+++ b/po/id.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: 2002-09-03 22:24+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Indonesian <rac@linux-mandrake.com>\n"
@@ -13,1571 +13,1698 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instalasi %s\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 "Yy"
 
-#: ../_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 "TtNn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versi %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Hakcipta (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 "Ini software gratis dan boleh disebar sesuai lisensi publik GNU."
+
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "pemakaian: urpmf [options] <file>"
+
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
-"Instalasi paket otomatis...\n"
-"Anda telah meminta instalasi paket %s\n"
+"  --quiet         - jangan cetak nama tag (standar jika tiada tag pada baris"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Semua beres?"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    perintah, tak kompatibel dg mode interaktif)."
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - cetak semua tag."
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Batal"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - cetak nama tag: rpm namafile (jika tiada diberikan pada"
 
-#: ../_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 "TtNn"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    baris perintah tapi tanpa nama paket)."
 
-#: ../_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 "Yy"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - cetak grup tag: grup."
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (Y/t) "
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - cetak ukuran tag: ukuran."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - cetak no. seri tag: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - cetak ringkasan tag: ringkasan."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - cetak penjelasan tag: penjelasan."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - cetak sediaan tag: semua sediaan (bbrp baris)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - cetak kebutuhan tag: semua kebutuhan (bbrp baris)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - cetak file tag: semua file (bbrp baris)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr "  --conflicts     - cetak konflik tag: semua konflik (bbrp baris)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - cetak syarat tag: semua syarat (bbrp baris)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "coba urpmf --help utk opsi lain"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "tak ditemukan daftar media lengkap"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: perintah tak tercari\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch tak dikenal `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (Y/t) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protokol tak dikenal didefinisikan untuk %s"
+msgid "Cancel"
+msgstr "Batal"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "tiada webfetch (curl / wget) ditemukan\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "gagal menangani protokol: %s"
+msgid "Is this OK?"
+msgstr "Semua beres?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Instalasi paket otomatis...\n"
+"Anda telah meminta instalasi paket %s\n"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instalasi %s\n"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...gagal disalin"
+msgid "unable to open rpmdb"
+msgstr "registrasi file rpm gagal"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget hilang\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "gagal akses file rpm [%s]"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget gagal: keluar dg %d atau sinyal %d\n"
+msgid "%s conflicts with %s"
+msgstr "%s konflik dg %s"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl hilang\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr "%s dibutuhkan oleh %s"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "media \"%s\" mencoba memakai list yg telah dipakai, media diabaikan"
+msgid "unable to install package %s"
+msgstr "gagal menginstal paket %s"
 
-#: ../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 ""
-"gagal pakai media \"%s\" sbg file list karena telah dipakai oleh media lain"
+msgid "unable to remove package %s"
+msgstr "paket %s tak dapat dihapus"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "\"%s\" telah dipakai, tak dapat digunakan utk media tak bernama"
+msgid "Preparing..."
+msgstr "Persiapan..."
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "media \"%s\" tak terpakai karena file daftar [%s] tak ada"
+msgid "...retrieving failed: %s"
+msgstr "...gagal terambil: %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "gagal tentukan media file hdlist [%s] ini"
+msgid "...retrieving done"
+msgstr "pengambilan selesai"
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "ambil file rpm..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "gagal mengakses file hdlist \"%s\", media diabaikan"
+msgid "malformed input: [%s]"
+msgstr "input cacat: [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "gagal mengakses file list \"%s\", media diabaikan"
+msgid "unable to access medium \"%s\""
+msgstr "gagal akses media \"%s\""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "coba bypass media \"%s\", abaikan"
+msgid "urpmi database locked"
+msgstr "database urpmi terkunci"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "gagal temukan file hdlist \"%s\", media diabaikan"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "media nonkoheren \"%s\" bertanda removable, seharusnya tidak"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "gagal cari file daftar \"%s\", media diabaikan"
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" tak dipilih"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "file list \"%s\" tak koheren, media diabaikan"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "gagal baca file rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "gagal periksa file daftar \"%s\", media diabaikan"
+msgid "package %s is not found."
+msgstr "paket %s tak tertemukan."
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "terlalu banyak titik sambung utk media removable \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ambil perangkat removable sbg \"%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:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "pakai removable device lain [%s] untuk \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "banyak paket dg nama file rpm sama \"%s\""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "tak dapat mengambil nama path utk media removable \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "gagal olah dg benar [%s] pada nilai \"%s\""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "gagal tulis file konfigurasi [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Paket berikut berisi %s: %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "tulis file konfigurasi [%s]"
+msgid "no package named %s"
+msgstr "tiada paket bernama %s"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "gagal menelaah \"%s\" di file [%s]"
+msgid "error registering local packages"
+msgstr "salah registrasi paket lokal"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "gagal akses file rpm [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "ambil file rpm..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "pemeriksaan handler paralel di file [%s]"
+msgid "invalid rpm file name [%s]"
+msgstr "nama file rpm [%s] tak berlaku"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "ditemukan handler paralel utk node: %s"
+msgid "no entries relocated in depslist"
+msgstr "tiada entri di depslist direlokasikan"
 
-#: ../urpm.pm_.c:780
-#, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "gunakan media terkait utk mode paralel : %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "%s entri di depslist direlokasikan"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "gagal menggunakan opsi paralel \"%s\""
+msgid "unmounting %s"
+msgstr "lepas mount %s"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis tak dapat dipakai dg --media, --update atau --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "gandeng %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "hapus %d header kadaluarsa dlm cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "temukan %d header di cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "bangun file sintesa hdlist utk media \"%s\""
 
-#: ../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]"
 msgstr "periksa baca file hdlist [%s]"
 
-#: ../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]"
 msgstr "periksa file sintesa [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "sulit membaca file hdlist media \"%s\""
+msgid "building hdlist [%s]"
+msgstr "bangun hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "baca header dari media \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "pembilasan kedua untuk menghitung ketergantungan\n"
 
-#: ../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\""
 msgstr "sulit membaca file sintesa hdlist utk media \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "registrasi file rpm gagal"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "media \"%s\" telah ada"
+msgid "nothing written in list file for \"%s\""
+msgstr "tak ada yg ditulis dlm file daftar \"%s\""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "file hdlist utk media \"%s\" tak ditemukan"
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "media %s ditambahkan"
+msgid "unable to write list file of \"%s\""
+msgstr "gagal baca file list \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "gagal mengakses media instalasi pertama"
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "file [%s] telah dipakai dalam media yang sama \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "sedang menyalin file hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "gagal olah file hdlist \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "copy selesai"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "file hdlist utk media \"%s\" tak ditemukan"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "copy selesai"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "gagal mengambil hdlist (atau sintesa) source"
 
-#: ../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)"
-msgstr ""
-"gagal mengakses media instalasi pertama (file Mandrake/base/hdlists tak "
-"ditemukan)"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "periksa baca file hdlist [%s]"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "ambil file hdlist..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "sedang menyalin sumber/sintesa hdlist \"%s\"..."
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "pengambilan selesai"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "ambil hdlist source (atau sintesa) \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...gagal terambil: %s"
+msgid "retrieving description file of \"%s\"..."
+msgstr "ambil file deskripsi \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "deskripsi hdlist \"%s\" di file hdlist tak berlaku"
+msgid "no rpm files found from [%s]"
+msgstr "tiada file rpm tertemukan dari [%s]"
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "sedang mencoba memilih media tak eksis \"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "gagal baca file rpm dari [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "reading rpm files from [%s]"
+msgstr "baca file rpm dari [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "memilih media majemuk: %s"
+msgid "...copying done"
+msgstr "copy selesai"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "copy selesai"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "hapus media \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "penyalinan daftar sumber \"%s\"..."
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "database urpmi terkunci"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "gagal salin [%s]"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "gagal akses media \"%s\""
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "sedang menyalin sumber/sintesa hdlist \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "file deskripsi \"%s\" sedang disalin"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "sedang menyalin sumber/sintesa hdlist \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "hapus media \"%s\""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "gagal salin [%s]"
+msgid "selecting multiple media: %s"
+msgstr "memilih media majemuk: %s"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "periksa baca file hdlist [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "penyalinan daftar sumber \"%s\"..."
+msgid "trying to select inexistent medium \"%s\""
+msgstr "sedang mencoba memilih media tak eksis \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "baca file rpm dari [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"gagal mengakses media instalasi pertama (file Mandrake/base/hdlists tak "
+"ditemukan)"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "gagal baca file rpm dari [%s]: %s"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "deskripsi hdlist \"%s\" di file hdlist tak berlaku"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "tiada file rpm tertemukan dari [%s]"
+msgid "retrieving hdlists file..."
+msgstr "ambil file hdlist..."
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "ambil file deskripsi \"%s\"..."
+msgid "copying hdlists file..."
+msgstr "sedang menyalin file hdlist..."
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "ambil hdlist source (atau sintesa) \"%s\"..."
+msgid "unable to access first installation medium"
+msgstr "gagal mengakses media instalasi pertama"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "gagal mengambil hdlist (atau sintesa) source"
+#: ../urpm.pm:1
+#, c-format
+msgid "added medium %s"
+msgstr "media %s ditambahkan"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "file hdlist utk media \"%s\" tak ditemukan"
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" telah ada"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "file [%s] telah dipakai dalam media yang sama \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "sulit membaca file hdlist media \"%s\""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "gagal olah file hdlist \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis tak dapat dipakai dg --media, --update atau --parallel"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "gagal baca file list \"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "gagal menggunakan opsi paralel \"%s\""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "file hdlist utk media \"%s\" tak ditemukan"
+msgid "using associated media for parallel mode: %s"
+msgstr "gunakan media terkait utk mode paralel : %s"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "tak ada yg ditulis dlm file daftar \"%s\""
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "pembilasan kedua untuk menghitung ketergantungan\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "ditemukan handler paralel utk node: %s"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "baca header dari media \"%s\""
+msgid "examining parallel handler in file [%s]"
+msgstr "pemeriksaan handler paralel di file [%s]"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "bangun hdlist [%s]"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "gagal menelaah \"%s\" di file [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "bangun file sintesa hdlist utk media \"%s\""
+msgid "write config file [%s]"
+msgstr "tulis file konfigurasi [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "temukan %d header di cache"
+msgid "unable to write config file [%s]"
+msgstr "gagal tulis file konfigurasi [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "hapus %d header kadaluarsa dlm cache"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "tak dapat mengambil nama path utk media removable \"%s\""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "gandeng %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "pakai removable device lain [%s] untuk \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "lepas mount %s"
+msgid "taking removable device as \"%s\""
+msgstr "ambil perangkat removable sbg \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s entri di depslist direlokasikan"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "terlalu banyak titik sambung utk media removable \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "tiada entri di depslist direlokasikan"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "gagal periksa file daftar \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nama file rpm [%s] tak berlaku"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "file list \"%s\" tak koheren, media diabaikan"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "ambil file rpm..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "gagal cari file daftar \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "gagal akses file rpm [%s]"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "gagal temukan file hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "gagal akses file rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "coba bypass media \"%s\", abaikan"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "salah registrasi paket lokal"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "gagal mengakses file list \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "tiada paket bernama %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "gagal mengakses file hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Paket berikut berisi %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "gagal tentukan media file hdlist [%s] ini"
 
-#: ../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\""
-msgstr "banyak paket dg nama file rpm sama \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "media \"%s\" tak terpakai karena file daftar [%s] tak ada"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "gagal olah dg benar [%s] pada nilai \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "\"%s\" telah dipakai, tak dapat digunakan utk media tak bernama"
 
-#: ../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)"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"gagal pakai media \"%s\" sbg file list karena telah dipakai oleh media lain"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "media \"%s\" mencoba memakai list yg telah dipakai, media diabaikan"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "paket %s tak tertemukan."
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "media \"%s\" mencoba memakai hdlist yg telah dipakai, media diabaikan"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" tak dipilih"
+msgid "syntax error in config file at line %s"
+msgstr "salah syntax dlm file konfigurasi baris %s"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "gagal baca file rpm [%s] dari media \"%s\""
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "media nonkoheren \"%s\" bertanda removable, seharusnya tidak"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "input cacat: [%s]"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync gagal: keluar dg %d atau sinyal %d\n"
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "ambil file rpm..."
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Persiapan..."
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh hilang\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "paket %s tak dapat dihapus"
+msgid "rsync is missing\n"
+msgstr "rsync hilang\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "gagal menginstal paket %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl gagal: keluar dg %d atau sinyal %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s dibutuhkan oleh %s"
+msgid "curl is missing\n"
+msgstr "curl hilang\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s konflik dg %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget gagal: keluar dg %d atau sinyal %d\n"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr "wget hilang\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 ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "...gagal disalin"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "unable to handle protocol: %s"
+msgstr "gagal menangani protokol: %s"
 
-#: ../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 "Instalasi gagal di node %s"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-msgid "Installation is possible"
-msgstr "Instalasi dimungkinkan"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "tiada webfetch (curl / wget) ditemukan\n"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
-#, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Instalasi gagal di node %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "protokol tak dikenal didefinisikan untuk %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "host %s tak punya urpmi dg versi yg tepat"
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Webfetch tak dikenal `%s' !!!\n"
 
-#: ../urpme_.c:39
+#: ../urpme:1
 #, fuzzy, 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 ""
-"urpmi versi %s\n"
-"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini software gratis dan boleh disebar sesuai lisensi publik GNU.\n"
-"\n"
-"pemakaian:\n"
-
-#: ../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         - cetak pesan pertolongan ini.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - seleksi otomatis paket pilihan.\n"
+msgid "Removing failed"
+msgstr "...gagal disalin"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - verifikasi apakah instalasi dapat dilaksanakan dg benar.\n"
+"Paket berikut akan dihapus agar syarat ketergantungan terpenuhi (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi tersebar di antara mesin-mesin alias.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Salah satu paket berikut dibutuhkan:"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Tiada yang dihapus.\n"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
+msgid "removing package %s will break your system"
+msgstr "sistem akan rusak jika paket %s dihapus\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "paket tak dikenal "
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "paket tak dikenal "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "sistem akan rusak jika paket %s dihapus\n"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
 
-#: ../urpme_.c:95
-#, fuzzy
-msgid "Nothing to remove"
-msgstr "Tiada yang dihapus.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Salah satu paket berikut dibutuhkan:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi tersebar di antara mesin-mesin alias.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Paket berikut akan dihapus agar syarat ketergantungan terpenuhi (%d MB)"
+"  --test         - verifikasi apakah instalasi dapat dilaksanakan dg benar.\n"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "...gagal disalin"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - seleksi otomatis paket pilihan.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - cetak pesan pertolongan ini.\n"
+
+#: ../urpme:1
 #, fuzzy, 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 ""
-"urpmq versi %s\n"
-"Haksalin (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini adalah perangkat lunak gratis dan boleh disebar sesuai GNU GPL.\n"
+"urpmi versi %s\n"
+"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini software gratis dan boleh disebar sesuai lisensi publik GNU.\n"
 "\n"
-"usage:\n"
+"pemakaian:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - pakai hanya media update.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - pakai hanya media terdaftar dg koma.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - gunakan synthesis yang diberikan, bukan db urpmi.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
 
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - mode detil.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
+"  -u             - hapus paket jika versi yg lebih baik telah diinstal.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - jangan cetak nama tag (standar jika tiada tag pada baris"
 
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - cetak semua tag."
-
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - cetak nama tag: rpm namafile (jika tiada diberikan pada"
+"  -u             - hapus paket jika versi yg lebih baik telah diinstal.\n"
 
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - cetak grup tag: grup."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - bersihkan direktori cache header.\n"
 
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - cetak ukuran tag: ukuran."
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - cetak versi, release dan arch dg nama.\n"
 
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - cetak ukuran tag: ukuran."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - paksa buat file hdlist.\n"
 
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - cetak ringkasan tag: ringkasan."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+"  --obsoletes     - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - cetak penjelasan tag: penjelasan."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr "  --conflicts     - cetak konflik tag: semua konflik (bbrp baris)."
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr "  --provides      - cetak sediaan tag: semua sediaan (bbrp baris)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - cetak file tag: semua file (bbrp baris)."
 
-#: ../urpmf_.c:47
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr "  --requires      - cetak kebutuhan tag: semua kebutuhan (bbrp baris)."
 
-#: ../urpmf_.c:48
-#, fuzzy
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - cetak file tag: semua file (bbrp baris)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+msgstr "  --provides      - cetak sediaan tag: semua sediaan (bbrp baris)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr "  --conflicts     - cetak konflik tag: semua konflik (bbrp baris)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - cetak penjelasan tag: penjelasan."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - cetak ringkasan tag: ringkasan."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - paksa buat file hdlist.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - cetak ukuran tag: ukuran."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - cetak versi, release dan arch dg nama.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - cetak ukuran tag: ukuran."
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - bersihkan direktori cache header.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - cetak grup tag: grup."
 
-#: ../urpmf_.c:54
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -u             - hapus paket jika versi yg lebih baik telah diinstal.\n"
+"  --name          - cetak nama tag: rpm namafile (jika tiada diberikan pada"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - cetak semua tag."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - jangan cetak nama tag (standar jika tiada tag pada baris"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  -u             - hapus paket jika versi yg lebih baik telah diinstal.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - mode detil.\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - gunakan synthesis yang diberikan, bukan db urpmi.\n"
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - pakai hanya media terdaftar dg koma.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - pakai hanya media update.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"pemakaian: urpmi.addmedia [opsi] <nama> <url> [with <path_relatif>]\n"
-"keterangan: <url> adalah\n"
-"       file://<path>\n"
-"       ftp://<login>:<sandi>@<host>/<path> with <namafile relatif hdlist>\n"
-"       ftp://<host>/<path> with <namafile relatif hdlist>\n"
-"       http://<host>/<path> with <namafile relatif hdlist>\n"
-"       removable://<path>\n"
+"urpmq versi %s\n"
+"Haksalin (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini adalah perangkat lunak gratis dan boleh disebar sesuai GNU GPL.\n"
 "\n"
-"dan [opsi] dari\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         - pakai wget utk mengambil file jauh.\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         - pakai curl utk mengambil file jauh.\n"
+"usage:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "semua telah terinstal"
 
-#: ../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        - gunakan proksi HTTP tertentu, nomor port dianggap\n"
-"                   1080 secara standar (dg format <hostproxy[:port]>).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalasi dimungkinkan"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - tentukan user dan katakunci utk otentikasi proxy\n"
-"                   (dg format <user:katakunci>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalasi gagal"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - buat media update.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Coba instalasi lebih keras (--force)? (y/T) "
 
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - buat semua media dari media instalasi dg otomatis.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Coba instalasi tanpa cek ketergantungan? (y/T) "
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "sebarkan %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr "  --env          - gunakan lingkungan khusus (umumnya laporan kutu).\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"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"Instalasi gagal, beberapa file hilanga.\n"
+"Anda mungkin perlu meng-update database urpmi"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (y/T) "
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - bersihkan direktori cache header.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Teruskan instalasi ?"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr "  -h             - coba temukan dan pakai file sintesa atau hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Paket berikut berisi tandatangan tak benar"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - paksa buat file hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Tekan [Enter] jika siap.."
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Masukkan media \"%s\" ke perangkat [%s]"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"tak perlu memberikan <path relatif hdlist> dg --distrib"
+msgid "unable to get source packages, aborting"
+msgstr "tak dapat mengambil paket asal, batal"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "gagal update media \"%s\"\n"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr ""
+"Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Anda perlu jadi root untuk menginstal ketergantungan berikut:\n"
 "%s\n"
-"<path relatif hdlist> hilang\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 ""
+"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
 "%s\n"
-"`with' tak tercantum utk media ftp\n"
+"Anda setuju?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "gagal membuat media \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "unrequested"
 msgstr ""
-"pemakaian: urpmi.removemedia [-a] <nama> ...\n"
-"<nama> adalah nama media yg akan dihapus.\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - pilih semua media.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "%s konflik dg %s"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "wget hilang\n"
+
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"\n"
-"opsi tak dikenal '%s'\n"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "tak ada penghapusan (pakailah urpmi.addmedia utk tambah media)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "gagal menginstal paket %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 ""
-"masukan utk penghapusan hilang\n"
-"(satu dari %s)\n"
+"Beberapa paket tak dapat diinstal:\n"
+"%s\n"
+"Setuju ?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"pemakaian: urpmi.update [opsi] <nama> ...\n"
-"<nama> adalah media yg akan di-update.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Salah pilih, coba lagi\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - pakai hanya media update.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - pilih semua media non-removable.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Salah satu paket berikut dibutuhkan:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d             - paksa perhitungan lengkap file depslist.ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "tak ada update (pakailah urpmi.addmedia utk tambah media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Hanya superuser yang boleh meng-instal paket"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"masukan update hilang\n"
-"(satu dari %s)\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 "gagal membuat direktori [%s] untuk laporan kutu"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"urpmi versi %s\n"
-"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini software gratis dan boleh disebar sesuai lisensi publik GNU.\n"
-"\n"
-"pemakaian:\n"
 
-#: ../urpmi_.c:75
-#, fuzzy
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - gunakan synthesis yang diberikan, bukan db urpmi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - otomatis menyeleksi paket utk upgrade sistem.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "deklarasi proxy buruk di baris perintah\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  nama atau file rpm yg tertera pada baris perintah telah diinstal.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - paket berikut adalah paket sumber (sama dg -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode detil.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode diam.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
+"  -s             - paket berikut adalah paket sumber (sama dg --src).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - hapus rpm dari cache sebelum hal-hal yg lain.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - jaga rpm tak dipakai di cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - jangan cari di provides utk mencari paket.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - paksa instal meski bbrp paket tak ada.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - izinkan search di provides utk mencari paket.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - izinkan meminta user utk menginstal paket tanpa\n"
-"                   mencek ketergantungan.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --media        - pakai hanya media terdaftar dg 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  - izinkan meminta user menginstal paket tanpa\n"
-"                   mencek ketergantungan dan integritas.\n"
+"  --verify-rpm   - verifikasi tandatangan rpm sebelum instalasi.\n"
+"                   (nonaktif dg --no-verify-rpm, default adalah aktif).\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          - keluarkan laporan bug ke direktori yg ditentukan oleh\n"
-"                   arg. berikut.\n"
+"  --best-output  - pilih antarmuka terbaik menurut lingkungan:\n"
+"                   X atau mode teks.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - pakai antarmuka X.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - gunakan lingkungan khusus (umumnya laporan kutu).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - pakai antarmuka X.\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  - pilih antarmuka terbaik menurut lingkungan:\n"
-"                   X atau mode teks.\n"
+"  --bug          - keluarkan laporan bug ke direktori yg ditentukan oleh\n"
+"                   arg. berikut.\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   - verifikasi tandatangan rpm sebelum instalasi.\n"
-"                   (nonaktif dg --no-verify-rpm, default adalah aktif).\n"
-
-#: ../urpmi_.c:106
-#, fuzzy
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --media        - pakai hanya media terdaftar dg koma.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - izinkan search di provides utk mencari paket.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - jangan cari di provides utk mencari paket.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
+"  --proxy-user   - tentukan user dan katakunci utk otentikasi proxy\n"
+"                   (dg format <user:katakunci>).\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             - paket berikut adalah paket sumber (sama dg --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mode diam.\n"
+"  --proxy        - gunakan proksi HTTP tertentu, nomor port dianggap\n"
+"                   1080 secara standar (dg format <hostproxy[:port]>).\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode detil.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr ""
 
-#: ../urpmi_.c:114
-#, fuzzy
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  nama atau file rpm yg tertera pada baris perintah telah diinstal.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - pakai curl utk mengambil file jauh.\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: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - pakai wget utk mengambil file jauh.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
+"  --allow-force  - izinkan meminta user menginstal paket tanpa\n"
+"                   mencek ketergantungan dan integritas.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "gagal membuat direktori [%s] untuk laporan kutu"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - izinkan meminta user utk menginstal paket tanpa\n"
+"                   mencek ketergantungan.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - paksa instal meski bbrp paket tak ada.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Hanya superuser yang boleh meng-instal paket"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - jaga rpm tak dipakai di cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - hapus rpm dari cache sebelum hal-hal yg lain.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Salah satu paket berikut dibutuhkan:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Pilihan Anda? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - paket berikut adalah paket sumber (sama dg -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Salah pilih, coba lagi\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -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 ""
-"Beberapa paket tak dapat diinstal:\n"
-"%s\n"
-"Setuju ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - otomatis menyeleksi paket utk upgrade sistem.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "gagal menginstal paket %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - gunakan synthesis yang diberikan, bukan db urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
+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 versi %s\n"
+"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini software gratis dan boleh disebar sesuai lisensi publik GNU.\n"
+"\n"
+"pemakaian:\n"
 
-#: ../urpmi_.c:409
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget hilang\n"
-
-#: ../urpmi_.c:414
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s konflik dg %s"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "gagal update media \"%s\"\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "gagal membuat media \"%s\"\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 ""
-"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
 "%s\n"
-"Anda setuju?"
+"`with' tak tercantum utk media ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
+"%s\n"
+"<path relatif hdlist> hilang\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 ""
-"Anda perlu jadi root untuk menginstal ketergantungan berikut:\n"
 "%s\n"
+"tak perlu memberikan <path relatif hdlist> dg --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "tak dapat mengambil paket asal, batal"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "ambil file rpm..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"opsi tak dikenal '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Masukkan media \"%s\" ke perangkat [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Tekan [Enter] jika siap.."
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - paksa buat file hdlist.\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Paket berikut berisi tandatangan tak benar"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr "  -h             - coba temukan dan pakai file sintesa atau hdlist.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Teruskan instalasi ?"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - bersihkan direktori cache header.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (y/T) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
 
-#: ../urpmi_.c:548
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  --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 ""
-"Instalasi gagal, beberapa file hilanga.\n"
-"Anda mungkin perlu meng-update database urpmi"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instalasi gagal"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr "  --env          - gunakan lingkungan khusus (umumnya laporan kutu).\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "sebarkan %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Coba instalasi tanpa cek ketergantungan? (y/T) "
+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 ""
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Coba instalasi lebih keras (--force)? (y/T) "
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - buat semua media dari media instalasi dg otomatis.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "semua telah terinstal"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - buat media update.\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 versi %s\n"
-"Haksalin (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini adalah perangkat lunak gratis dan boleh disebar sesuai GNU GPL.\n"
+"pemakaian: urpmi.addmedia [opsi] <nama> <url> [with <path_relatif>]\n"
+"keterangan: <url> adalah\n"
+"       file://<path>\n"
+"       ftp://<login>:<sandi>@<host>/<path> with <namafile relatif hdlist>\n"
+"       ftp://<host>/<path> with <namafile relatif hdlist>\n"
+"       http://<host>/<path> with <namafile relatif hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - daftar paket tersedia.\n"
+"dan [opsi] dari\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - daftar media tersedia.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"masukan utk penghapusan hilang\n"
+"(satu dari %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - daftar node tersedia saat menggunakan --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "tak ada penghapusan (pakailah urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-media   - daftar media tersedia.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - pilih semua media.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - keluarkan header packet terdaftar dari dalam db urpmi ke\n"
-"                   stdout (hanya root).\n"
+"pemakaian: urpmi.removemedia [-a] <nama> ...\n"
+"<nama> adalah nama media yg akan dihapus.\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      - beri semua paket source sebelum download (hanya only).\n"
+"masukan update hilang\n"
+"(satu dari %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - tambah pencarian ke ketergantungan paket.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "tak ada update (pakailah urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - hapus paket jika versi yg lebih baru telah terinstal.\n"
-
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    baris perintah tapi tanpa nama paket)."
-
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -p             - izinkan search di provides utk mencari paket.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d             - paksa perhitungan lengkap file depslist.ordered.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - cetak grup dg nama juga.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - pilih semua media non-removable.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - juga cetak versi dan release dg nama.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - pakai hanya media update.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  dicarikan nama atau file rpm yg tertera pada baris perintah.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"pemakaian: urpmi.update [opsi] <nama> ...\n"
+"<nama> adalah media yg akan di-update.\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--synthesis tak dapat dipakai dg --media, --update atau --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versi %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: tak dapat membaca file rpm \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Hakcipta (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opsi asing \"-%s\", cek pemakaian dg --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr "Ini software gratis dan boleh disebar sesuai lisensi publik GNU."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  dicarikan nama atau file rpm yg tertera pada baris perintah.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "pemakaian: urpmf [options] <file>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - juga cetak versi dan release dg nama.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - jangan cetak nama tag (standar jika tiada tag pada baris"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - cetak grup dg nama juga.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    perintah, tak kompatibel dg mode interaktif)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -p             - izinkan search di provides utk mencari paket.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - cetak semua tag."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    baris perintah tapi tanpa nama paket)."
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - cetak nama tag: rpm namafile (jika tiada diberikan pada"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    baris perintah tapi tanpa nama paket)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - cetak grup tag: grup."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - cetak ukuran tag: ukuran."
+"  -u             - hapus paket jika versi yg lebih baru telah terinstal.\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - cetak no. seri tag: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - tambah pencarian ke ketergantungan paket.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - cetak ringkasan tag: ringkasan."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - beri semua paket source sebelum download (hanya only).\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - cetak penjelasan tag: penjelasan."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - keluarkan header packet terdaftar dari dalam db urpmi ke\n"
+"                   stdout (hanya root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - cetak sediaan tag: semua sediaan (bbrp baris)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-media   - daftar media tersedia.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - cetak kebutuhan tag: semua kebutuhan (bbrp baris)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - daftar node tersedia saat menggunakan --parallel.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - cetak file tag: semua file (bbrp baris)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - daftar media tersedia.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr "  --conflicts     - cetak konflik tag: semua konflik (bbrp baris)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - daftar paket tersedia.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (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 ""
-"  --obsoletes     - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - cetak syarat tag: semua syarat (bbrp baris)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "coba urpmf --help utk opsi lain"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "tak ditemukan daftar media lengkap"
+"urpmq versi %s\n"
+"Haksalin (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini adalah perangkat lunak gratis dan boleh disebar sesuai GNU GPL.\n"
+"\n"
+"usage:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl gagal: keluar dg %d atau sinyal %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalasi gagal di node %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync hilang\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync gagal: keluar dg %d atau sinyal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh hilang\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "salah syntax dlm file konfigurasi baris %s"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Instalasi gagal di node %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "media \"%s\" mencoba memakai hdlist yg telah dipakai, media diabaikan"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "host %s tak punya urpmi dg versi yg tepat"
 
 #~ msgid "Remove them all?"
 #~ msgstr "Hapus semua?"
@@ -1602,12 +1729,6 @@ msgstr "tak ditemukan daftar media lengkap"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - cetak pesan pertolongan ini.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: opsi asing \"-%s\", cek pemakaian dg --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: tak dapat membaca file rpm \"%s\"\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi tak terinstal"
 
@@ -1767,9 +1888,6 @@ msgstr "tak ditemukan daftar media lengkap"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Hakcipta (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "deklarasi proxy buruk di baris perintah\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr "pemakaian: urpmi.addmedia [opsi] <nama> <url> [dg <path_relatif>]"
 
diff --git a/po/is.po b/po/is.po
index d2e1562f..f50323a9 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,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: 2000-04-19 23:05-0400\n"
 "Last-Translator: Thorarinn R. Einarsson <thori@mindspring.com>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,1432 +14,1610 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "Set inn %s\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 "Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr ""
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr ""
+
+#: 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 ""
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Er �a� � lagi?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr ""
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "� lagi"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "H�tta vi�"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_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 ""
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
 
-#: ../_irpm_.c:63
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr ""
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr ""
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr ""
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr ""
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr ""
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr ""
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr ""
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+msgid "Cancel"
+msgstr "H�tta vi�"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "� lagi"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Er �a� � lagi?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "installing %s\n"
+msgstr "Set inn %s\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "Innsetning br�st"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+msgid "%s is needed by %s"
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "unable to remove package %s"
 msgstr ""
 
-#: ../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"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "urpmi database locked"
+msgstr "rpm gagnaskr�rbei�ni br�st\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%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:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1 ../urpme:1
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "Enginn '%s' pakki\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
+msgid "unable to register rpm file"
 msgstr ""
 
-#: ../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
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../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
+#, fuzzy, c-format
+msgid "unmounting %s"
+msgstr "Set inn %s\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "Set inn %s\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../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]"
 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]"
 msgstr ""
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
+msgid "building hdlist [%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 "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
+msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
+#: ../urpm.pm:1
+#, c-format
+msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%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 "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "Innsetning br�st"
-
-#: ../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 "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%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 "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-#, fuzzy
-msgid "urpmi database locked"
-msgstr "rpm gagnaskr�rbei�ni br�st\n"
-
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "Innsetning br�st"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "copy of [%s] failed"
 msgstr "Innsetning br�st"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "retrieving hdlists file..."
 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 "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
+msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1798
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "Set inn %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "write config file [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:1811
-#, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "Set inn %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:1865
-msgid "unable to register rpm file"
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:1960
-#, fuzzy, c-format
-msgid "no package named %s"
-msgstr "Enginn '%s' pakki\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+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 "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "unable to access hdlist file of \"%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 "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 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 ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
+msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Innsetning br�st"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
+msgid "copy failed: %s"
 msgstr "Innsetning br�st"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
-#, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Innsetning br�st"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr ""
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../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"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Til a� uppfylla innsetningarkr�fur ver�a eftirtaldir pakkar settir inn (%d "
+"MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "Enginn '%s' pakki\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "Enginn '%s' pakki\n"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
 
-#: ../urpme_.c:105
-#, fuzzy, c-format
+#: ../urpme:1 ../urpmi:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Til a� uppfylla innsetningarkr�fur ver�a eftirtaldir pakkar settir inn (%d "
-"MB)"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../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 ""
 
-#: ../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_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr ""
-
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf_.c:54
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf_.c:115
+#: ../urpmf:1
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../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 "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:57 ../urpmi.update_.c:66 ../urpmi_.c:92 ../urpmq_.c:58
+#: ../urpmf: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"
+"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 ""
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "Allt er n� �egar komi� inn"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Innsetning br�st"
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Innsetning br�st"
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pr�fa sterkari innsetningu (--force)? (j/N) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�fa innsetningu �n �ess a� athuga hva�a skr�r �arf? (j/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"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "Set inn %s\n"
 
-#: ../urpmi.addmedia_.c:72
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Sl��u � ENTER eftir�..."
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vinsamlega settu inn %s %s"
+
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
+"Til a� uppfylla innsetningarkr�fur ver�a eftirtaldir pakkar settir inn (%d "
+"MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sl�mt val.  Reyndu aftur\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Hva� viltu? (1-%d) "
+
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
+
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../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 "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../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 "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
+#: ../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"
 msgstr ""
 
-#: ../urpmi_.c:349
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
-
-#: ../urpmi_.c:358
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hva� viltu? (1-%d) "
+msgid "unable to update medium \"%s\"\n"
+msgstr ""
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sl�mt val.  Reyndu aftur\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
 "%s\n"
-"do you agree ?"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: ../urpmi_.c:402
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "in order to install %s"
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi_.c:407
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr ""
-
-#: ../urpmi_.c:416
-msgid "unrequested"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:421
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
-"Til a� uppfylla innsetningarkr�fur ver�a eftirtaldir pakkar settir inn (%d "
-"MB)"
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+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 ""
 
-#: ../urpmi_.c:507
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vinsamlega settu inn %s %s"
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Sl��u � ENTER eftir�..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (J/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"
+"  --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 ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Innsetning br�st"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "Set inn %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pr�fa innsetningu �n �ess a� athuga hva�a skr�r �arf? (j/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pr�fa sterkari innsetningu (--force)? (j/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "Allt er n� �egar komi� inn"
-
-#: ../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"
-"\n"
-"usage:\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
 msgstr ""
 
-#: ../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 ""
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:51
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:53
+#: ../urpmi.removemedia:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Innsetning br�st"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr ""
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Innsetning br�st"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
 #~ msgid "Is it ok?"
diff --git a/po/it.po b/po/it.po
index 495a1b04..028c6f26 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-it\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-03-02 10:03+0100\n"
 "Last-Translator: Roberto Rosselli Del Turco <rosselli@ling.unipi.it>\n"
 "Language-Team: italiano <tp@lists.linux.it>\n"
@@ -18,1156 +18,1287 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "installazione di %s in corso\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 "SsYy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versione %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Installazione automatica dei pacchetti...\n"
-"Avete richiesto l'installazione del pacchetto %s\n"
+"Questo � software libero e pu� essere ridistribuito secondo i termini della "
+"GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "E' corretto?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "uso: urpmf [options] <file>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - non stampare il nome del tag (default senza il tag nella "
+"riga"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Annulla"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    di comando, incompatibile col modo interattivo)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - stampa tutti i tag."
 
-#: ../_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 "SsYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - stampa il nome del tag: rpm filename (presupposto senza "
+"tag"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (S/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
+"                    nella riga di comando ma senza nome del pacchetto)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - stampa il tag gruppo: group."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - stampa la dimensione del tag: size."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - stampa il seriale del tag: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --sommario      - stampa il sommario del tag: summary."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --descrizione   - stampa la descrizione del tag: description."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - stampa i tag provides: all provides (pi� righe)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - stampa i tag requires: all requires (pi� righe)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - stampa i tag files: all files (pi� righe)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - stampa i conflitti dei tag: all conflicts (pi� righe)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr "  --obsoletes     - stampa i tag obsoletes: all obsoletes (pi� righe)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - stampa i tag prereqs: all prereqs (pi� righe)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "prova urmpf --help per pi� opzioni"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "non � stata trovata una lista completa dei supporti"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: comando non trovato\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch sconosciuto `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocollo sconosciuto definito per %s"
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "programmi di webfetch (attualmente curl o wget) non trovati\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "non riesco a gestire il protocollo: %s"
+msgid "Is this OK?"
+msgstr "E' corretto?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "copia fallita: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Installazione automatica dei pacchetti...\n"
+"Avete richiesto l'installazione del pacchetto %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget non � presente \n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "installazione di %s in corso\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget fallito: terminato con %d o segnale %d\n"
+msgid "unable to open rpmdb"
+msgstr "non riesco ad aprire il database rpm"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl non � presente\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "non riesco ad accedere al file rpm [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "il supporto \"%s\" cerca di usare una lista gi� usata, lo ignoro"
+msgid "%s conflicts with %s"
+msgstr "%s � in conflitto con %s"
 
-#: ../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 ""
-"non risco ad occuparmi del supporto \"%s\", il list file � gi� usato da un "
-"altro supporto"
+msgid "%s is needed by %s"
+msgstr "%s � richiesto da %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "non riesco ad usare il nome \"%s\" per il supporto perch� � gi� in uso"
+msgid "unable to install package %s"
+msgstr "impossibile installare il pacchetto %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"non riesco a prendere in considerazione il supporto \"%s\" poich� non esiste "
-"un list file [%s]"
+msgid "unable to remove package %s"
+msgstr "impossibile rimuovere il pacchetto %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "non riesco a determinare il supporto di questo hdlist file [%s]"
+msgid "Preparing..."
+msgstr "In preparazione..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "non riesco ad accedere all'hdlist file di \"%s\", ignoro il supporto"
+msgid "...retrieving failed: %s"
+msgstr "...recupero fallito: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "non riesco ad accedere il list file di \"%s\", ignoro il supporto"
+msgid "...retrieving done"
+msgstr "...recupero terminato"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "cerco di bypassare il supporto esistente \"%s\", evito"
+msgid "malformed input: [%s]"
+msgstr "input malformato: [%s]"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "non riesco a trovare l'hdlist file per \"%s\", supporto ignorato"
+msgid "unable to access medium \"%s\""
+msgstr "non riesco ad accedere al supporto \"%s\""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "non riesco a trovare il list file per \"%s\", ignoro il supporto"
+msgid "urpmi database locked"
+msgstr "database urpmi bloccato"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "list file incoerente per \"%s\", ignoro il supporto"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "supporto incoerente \"%s\", segnato come removibile ma non tale"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "non riesco ad analizzare il list file per \"%s\", ignoro il supporto"
+msgid "medium \"%s\" is not selected"
+msgstr "il supporto \"%s\" non � selezionato"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "troppi mount point per il media removibile \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "prendo il device removibile come \"%s\""
+msgid "package %s is not found."
+msgstr "il pacchetto %s non � stato trovato"
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "sto usando un diverso device removibile [%s] per \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "non riesco a recuperare il pathname per il media removibile \"%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:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "non riesco a scrivere sul file di configurazione [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ci sono diversi pacchetti rpm con lo stesso nome di file \"%s\""
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "scrivi il file di configurazione [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "non riesco ad analizzare correttamente [%s] per il valore \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "non riesco ad effettuare il parsing di \"%s\" nel file [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "I seguenti pacchetti contengono %s: %s"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "esamino l'handler parallelo nel file [%s]"
+msgid "no package named %s"
+msgstr "nessun pacchettto denominato %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "trovato handler parallelo per i nodi: %s"
+msgid "error registering local packages"
+msgstr "errore durante la registrazione dei pacchetti locali"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "non riesco ad accedere al file rpm [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "recupero il file descrittivo di \"%s\"..."
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "invalid rpm file name [%s]"
+msgstr "nome del file rpm non valido [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "non riesco a utilizzare l'opzione parallel \"%s\" "
+msgid "no entries relocated in depslist"
+msgstr "nessuna entry riallocata nella depslist"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr ""
-"--synthesis non pu� essere utilizzato con --media, --update o --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "%s lemmi riposizionati nella deplist"
 
-#: ../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 "unmounting %s"
+msgstr "sto smontando %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "sto montando %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "sto rimuovendo %d intestazioni obsolete in cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "%d intestazioni trovate in cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "ho costruito la sintesi dell'hdlist file per il supporto \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "esamino l'hdlist file [%s]"
 
-#: ../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]"
 msgstr "esamino il file di sintesi [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problema nel leggere il file hdlist dell supporto \"%s\""
+msgid "building hdlist [%s]"
+msgstr "sto costruendo l'hdlist [%s]"
 
-#: ../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\""
-msgstr "problema nel leggere il file synthesis del supporto \"%s\""
+msgid "reading headers from medium \"%s\""
+msgstr "sto leggendo le intestazioni dal supporto \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "non riesco ad aprire il database rpm"
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "passo alla fase successiva per valutare le dipendenze\n"
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "il supporto \"%s\" gi� esiste"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problema nel leggere il file synthesis del supporto \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "media %s aggiunto"
+msgid "nothing written in list file for \"%s\""
+msgstr "niente scritto nel list file per \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "non riesco ad accedere il primo media di installazione"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "non trovo l'hdlist file per il supporto \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "copio l'hdlist file..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "non riesco a scrivere il list file di \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...copia terminata"
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "file [%s] gi� in uso nello stesso supporto \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...copia terminata"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "non riesco ad analizzare l'hdlist file di \"%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)"
-msgstr ""
-"non riesco ad accedere al primo media di installazione (non trovo il file "
-"Mandrake/base/hdlist)"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "non trovo l'hdlist file per il supporto \"%s\""
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "recupero i file hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "recupero della source hdlist (o sintesi) fallito"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...recupero terminato"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "esamino l'hdlist file [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "copio la source hdlist (o una sintesi) di \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...recupero fallito: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "recupero la source hdlist (o una sitntesi) di \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descrizione hdlist non valida \"%s\" nei file di hdlist"
+msgid "retrieving description file of \"%s\"..."
+msgstr "recupero il file descrittivo di \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "tentativo di selezionare un supporto inesistente \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nessun file rpm trovato da [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "non riesco a leggere i file rpm da [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "sto selezionando pi� supporti: %s"
+msgid "reading rpm files from [%s]"
+msgstr "sto leggendo i file rpm da [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "rimuovo il media \"%s\""
+msgid "...copying done"
+msgstr "...copia terminata"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "database urpmi bloccato"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...copia terminata"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "non riesco ad accedere al supporto \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "copio la source list di \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copio il file di descrizione di \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "copia di [%s] fallita"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copio la source hdlist (o una sintesi) di \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "copia di [%s] fallita"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "esamino l'hdlist file [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "copio il file di descrizione di \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "copio la source list di \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "rimuovo il media \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "sto leggendo i file rpm da [%s]"
+msgid "selecting multiple media: %s"
+msgstr "sto selezionando pi� supporti: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "non riesco a leggere i file rpm da [%s]: %s"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nessun file rpm trovato da [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "tentativo di selezionare un supporto inesistente \"%s\""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "recupero il file descrittivo di \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"non riesco ad accedere al primo media di installazione (non trovo il file "
+"Mandrake/base/hdlist)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "recupero la source hdlist (o una sitntesi) di \"%s\"..."
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "recupero della source hdlist (o sintesi) fallito"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descrizione hdlist non valida \"%s\" nei file di hdlist"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "non trovo l'hdlist file per il supporto \"%s\""
+msgid "retrieving hdlists file..."
+msgstr "recupero i file hdlist..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "file [%s] gi� in uso nello stesso supporto \"%s\""
+msgid "copying hdlists file..."
+msgstr "copio l'hdlist file..."
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "non riesco ad analizzare l'hdlist file di \"%s\""
+msgid "unable to access first installation medium"
+msgstr "non riesco ad accedere il primo media di installazione"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "non riesco a scrivere il list file di \"%s\""
+msgid "added medium %s"
+msgstr "media %s aggiunto"
 
-#: ../urpm.pm_.c:1526
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "non trovo l'hdlist file per il supporto \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" already exists"
+msgstr "il supporto \"%s\" gi� esiste"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "niente scritto nel list file per \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problema nel leggere il file hdlist dell supporto \"%s\""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "passo alla fase successiva per valutare le dipendenze\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
+"--synthesis non pu� essere utilizzato con --media, --update o --parallel"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "sto leggendo le intestazioni dal supporto \"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "non riesco a utilizzare l'opzione parallel \"%s\" "
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "sto costruendo l'hdlist [%s]"
+msgid "using associated media for parallel mode: %s"
+msgstr ""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "ho costruito la sintesi dell'hdlist file per il supporto \"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr "trovato handler parallelo per i nodi: %s"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d intestazioni trovate in cache"
+msgid "examining parallel handler in file [%s]"
+msgstr "esamino l'handler parallelo nel file [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "sto rimuovendo %d intestazioni obsolete in cache"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "non riesco ad effettuare il parsing di \"%s\" nel file [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "sto montando %s"
+msgid "write config file [%s]"
+msgstr "scrivi il file di configurazione [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "sto smontando %s"
+msgid "unable to write config file [%s]"
+msgstr "non riesco a scrivere sul file di configurazione [%s]"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s lemmi riposizionati nella deplist"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "non riesco a recuperare il pathname per il media removibile \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "nessuna entry riallocata nella depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "sto usando un diverso device removibile [%s] per \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nome del file rpm non valido [%s]"
+msgid "taking removable device as \"%s\""
+msgstr "prendo il device removibile come \"%s\""
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "recupero il file descrittivo di \"%s\"..."
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "troppi mount point per il media removibile \"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "non riesco ad accedere al file rpm [%s]"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "non riesco ad analizzare il list file per \"%s\", ignoro il supporto"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "non riesco ad accedere al file rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "list file incoerente per \"%s\", ignoro il supporto"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "errore durante la registrazione dei pacchetti locali"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "non riesco a trovare il list file per \"%s\", ignoro il supporto"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "nessun pacchettto denominato %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "non riesco a trovare l'hdlist file per \"%s\", supporto ignorato"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "I seguenti pacchetti contengono %s: %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "cerco di bypassare il supporto esistente \"%s\", evito"
 
-#: ../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\""
-msgstr "ci sono diversi pacchetti rpm con lo stesso nome di file \"%s\""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "non riesco ad accedere il list file di \"%s\", ignoro il supporto"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "non riesco ad analizzare correttamente [%s] per il valore \"%s\""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "non riesco ad accedere all'hdlist file di \"%s\", ignoro il supporto"
 
-#: ../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)"
-msgstr ""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "non riesco a determinare il supporto di questo hdlist file [%s]"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
+"non riesco a prendere in considerazione il supporto \"%s\" poich� non esiste "
+"un list file [%s]"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "il pacchetto %s non � stato trovato"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "non riesco ad usare il nome \"%s\" per il supporto perch� � gi� in uso"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "il supporto \"%s\" non � selezionato"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"non risco ad occuparmi del supporto \"%s\", il list file � gi� usato da un "
+"altro supporto"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "il supporto \"%s\" cerca di usare una lista gi� usata, lo ignoro"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "supporto incoerente \"%s\", segnato come removibile ma non tale"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "il supporto \"%s\" cerca di usare una hdlist gi� usata, lo ignoro"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "input malformato: [%s]"
+msgid "syntax error in config file at line %s"
+msgstr "errore di sintassi nel file di configurazione alla linea %s"
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "In preparazione..."
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completati, velocit� = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "impossibile rimuovere il pacchetto %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% di %s completati, ETA = %s, velocit� = %s"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "impossibile installare il pacchetto %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync fallito: terminato con %d o segnale %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s � richiesto da %s"
+msgid "ssh is missing\n"
+msgstr "ssh non � presente\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s � in conflitto con %s"
+msgid "rsync is missing\n"
+msgstr "rsync non � presente\n"
 
-#: ../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 fallito, probabilmente il nodo � irraggiungibile"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl fallito: terminato con %d o segnale %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 fallito, probabilmente il nodo � irraggiungibile"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl non � presente\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "sul nodo %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget fallito: terminato con %d o segnale %d\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 "Installazione fallita sul nodo %s"
+msgid "wget is missing\n"
+msgstr "wget non � presente \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 "L'installazione � possibile"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "copia fallita: %s"
 
-#: ../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 fallito sul nodo %s"
+msgid "unable to handle protocol: %s"
+msgstr "non riesco a gestire il protocollo: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "l'host %s non dispone di una buona versione di urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "programmi di webfetch (attualmente curl o wget) non trovati\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 versione %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Questo � software gratuito e pu� essere ridistribuito sotto i termini della "
-"GNU GPL.\n"
-"\n"
-"uso:\n"
+msgid "unknown protocol defined for %s"
+msgstr "protocollo sconosciuto definito per %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         - stampa questo messaggio di aiuto.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Webfetch sconosciuto `%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - include automaticamente un pacchetto nelle scelte.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Rimozione fallita"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - verifica che l'installazione possa essere effettuata "
-"correttamente.\n"
+"Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuito fra varie macchine.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Controllo la rimozione dei seguenti pacchetti:"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - seleziona tutti i pacchetti che soddisfano "
-"l'espressione.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Niente da rimuovere"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: opzione sconosciuta \"-%s\", controllane l'uso con --help\n"
+msgid "removing package %s will break your system"
+msgstr "la rimozione del pacchetto %s comprometter� il sistema"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "pacchetto sconosciuto"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "pacchetti sconosciuti"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "la rimozione del pacchetto %s comprometter� il sistema"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: opzione sconosciuta \"-%s\", controllane l'uso con --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Niente da rimuovere"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - seleziona tutti i pacchetti che soddisfano "
+"l'espressione.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Controllo la rimozione dei seguenti pacchetti:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuito fra varie macchine.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti (%d MB)"
+"  --test         - verifica che l'installazione possa essere effettuata "
+"correttamente.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Rimozione fallita"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - include automaticamente un pacchetto nelle scelte.\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         - stampa questo messaggio di aiuto.\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 versione %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"urpme versione %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Questo � software gratuito e pu� essere ridistribuito sotto i termini della "
 "GNU GPL.\n"
 "\n"
 "uso:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "--update       - usa solo supporti di aggiornamento.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"callback :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"  --media        - usa solo i supporti nella lista, separati da virgole.\n"
+"  )              - parentesi destra per chiudere un gruppo di espressioni.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
+"  (              - parentesi sinistra per aprire un gruppo di espressioni.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modalit� prolissa.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - NOT unario, vero se l'espressione � falsa.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - non stampare il nome del tag (default se non viene usato "
-"tag nella riga) \n"
-"                    di comando, incompatibile con la modalit� interattiva).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - stampa tutti i tag.\n"
+"  -o             - operatore binario OR, vero se una delle espressioni � "
+"vera.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name         - stampa il nome del tag: rpm filename (presupposto se non "
-"viene\n"
-"                   usato tag nella riga di comando ma senza il nome del "
-"pacchetto).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - stampa il tag gruppo: group.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - stampa la dimensione del tag: size.\n"
-
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch          - stampa il tag epoch: epoch.\n"
-
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - stampa il sommario del tag: summary.\n"
+"  -a             - operatore binario AND, vero se entrambe le espressioni "
+"sono vere.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - stampa la descrizione del tag: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --provides      - stampa il provides del tag: all provides (pi� linee).\n"
+"  -f             - stampa versione, release e architettura con il nome.\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
-"  --requires      - stampa i requires del tag: all requires (pi� linee).\n"
+"  -i             - ignora la distinzione tra maiuscole/minuscole in "
+"qualsiasi pattern.\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - stampa i tag files: all files (pi� linee).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+"  --obsoletes     - stampa gli obsoletes del tag: all obsoletes (pi� "
+"linee).\n"
 
-#: ../urpmf_.c:49
+#: ../urpmf:1
+#, c-format
 msgid ""
 "  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 "  --conflicts     - stampa i conflitti dei tag: all conflicts (pi� righe).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - stampa gli obsoletes del tag: all obsoletes (pi� "
-"linee).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - stampa i tag files: all files (pi� linee).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  -i             - ignora la distinzione tra maiuscole/minuscole in "
-"qualsiasi pattern.\n"
+"  --requires      - stampa i requires del tag: all requires (pi� linee).\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  -f             - stampa versione, release e architettura con il nome.\n"
+"  --provides      - stampa il provides del tag: all provides (pi� linee).\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - stampa la descrizione del tag: description.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - stampa il sommario del tag: summary.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch          - stampa il tag epoch: epoch.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - stampa la dimensione del tag: size.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - stampa il tag gruppo: group.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - operatore binario AND, vero se entrambe le espressioni "
-"sono vere.\n"
+"  --name         - stampa il nome del tag: rpm filename (presupposto se non "
+"viene\n"
+"                   usato tag nella riga di comando ma senza il nome del "
+"pacchetto).\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - stampa tutti i tag.\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - operatore binario OR, vero se una delle espressioni � "
-"vera.\n"
+"  --quiet         - non stampare il nome del tag (default se non viene usato "
+"tag nella riga) \n"
+"                    di comando, incompatibile con la modalit� interattiva).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - NOT unario, vero se l'espressione � falsa.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modalit� prolissa.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  (              - parentesi sinistra per aprire un gruppo di espressioni.\n"
+"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  )              - parentesi destra per chiudere un gruppo di espressioni.\n"
+"  --media        - usa solo i supporti nella lista, separati da virgole.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"callback :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "--update       - usa solo supporti di aggiornamento.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"uso: urpmi.addmedia [opzioni] <nome> <url> [with <relative_path>]\n"
-"dove <url> � uno fra\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relativo nome di hdlist "
-"file>\n"
-"       ftp://<host>/<path> with <relativo nome di hdlist file>\n"
-"       http://<host>/<path> with <relativo nome di hdlist file>\n"
-"       removable://<path>\n"
+"urpmf versione %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Questo � software gratuito e pu� essere ridistribuito sotto i termini della "
+"GNU GPL.\n"
 "\n"
-"e le [opzioni] una combinazione di\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         - usa wget per recuperare file remoti.\n"
+"uso:\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         - usa curl per recuperare i file remoti.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "Tutto gi� installato"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limita la velocit� del download.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "L'installazione � possibile"
 
-#: ../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        - usa il proxy HTTP specificato, il numero di porta\n"
-"                   predefinito � 1080 (formato: <proxyhost[:port]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installazione fallita"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - specifica utente e password da utilizzare per\n"
-"                   l'autenticazione col proxy (formato: <utente:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Provo l'installazione in modo ancora pi� forzato (--force)? (s/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea un suppotyo di aggiornamento.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - crea automaticamente tutti i supporti da quelli di\n"
-"                    installazione.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "sto distribuendo %s\n"
 
-#: ../urpmi.addmedia_.c:64
+#: ../urpmi: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"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --distrib-XXX  - crea automaticamente un supporto per una parte XXX di "
-"una\n"
-"                   distribuzione, XXX pu� essere main, contrib, updates o\n"
-"                   qualsiasi altra cosa configurata ;-)\n"
+"Installazione fallita, alcuni file sono mancanti:\n"
+"%s\n"
+"Potresti voler aggiornare il tuo database di urpmi"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - usa un url specifica per ottenere la lista dei mirror, "
-"quella\n"
-"                   predefinita � %s\n"
+msgid " (y/N) "
+msgstr " (s/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"
-msgstr ""
-"  --version      - usa una specifica versione, come opzione predefinita\n"
-"                   � quella installata con la versione corrente di Mandrake\n"
-"                   Linux.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Vuoi proseguire con l'installazione?"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - usa una specifica architettura, quella predefinita � "
-"l'architettura\n"
-"                   della versione di Mandrake Linux installata.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "I seguenti pacchetti hanno delle firme errate"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-"  -c             - ripulisci le intestazioni dalle directory in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Premi Invio quando sei pronto..."
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
-"  -h             - prova a trovare ed usare il file synthesis o hdlist\n"
-
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forza la generazione dei file hdlist.\n"
+"Per favore inserisci il supporto denominato \"%s\" nel dispositivo [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "non posso aggiungere gli aggiornamenti della distribuzione cooker\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "non riesco a recuperare il pacchetto sorgente, interrompo"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"non c'� bisogno di fornire <relativo percorso di hdlist> con --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "non riesco ad aggiornare il supporto \"%s\"\n"
+"Per soddisfare le dipendenze, saranno installati i seguenti pacchetti (%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Dovete essere root per installare le seguenti dipendenze:\n"
 "%s\n"
-"manca <relativo percorso di hdlist>\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 ""
+"Alcuni pacchetti devono essere rimossi per poterne aggiornare altri:\n"
 "%s\n"
-"`with` assente per supporti ftp\n"
+"va bene?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "non riesco a creare il supporto \"%s\"\n"
+msgid "unrequested"
+msgstr "non richiesto"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"uso: urpmi.removemedia [-a] <nome> ...\n"
-"dove <nome> � il nome del supporto da rimuovere.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "per conflitti con %s"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - seleziona tutti i supporti.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "perch� manca %s"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opzioni sconosciute '%s'\n"
+msgid "due to unsatisfied %s"
+msgstr "perch� non � soddisfatto %s"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "niente da rimuovere (usa urpmi.addmedia per aggiungere un supporto)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "per installare %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 ""
-"la voce da rimuovere non � presente\n"
-"(uno di %s)\n"
+"Alcuni dei pacchetti richiesti non possono essere installati:\n"
+"%s\n"
+"va bene?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"uso: urpmi.update [opzioni] <nome> ...\n"
-"dove <nome> � il nome del supporto da aggiornare.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Spiacente, scelta errata, prova di nuovo\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "--update       - usa solo supporti di aggiornamento.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Qual � la tua scelta? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - seleziona tutti i supporti non rimovibili.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "E' richiesto uno dei seguenti pacchetti:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - forza il calcolo completo del file deplist.ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Per installare %s � richiesto uno dei seguenti pacchetti:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"niente da aggiornare (usa urpmi.addsupporti per aggiungere un supporto)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Solo superuser � abilitato ad installare pacchetti"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"la voce da aggiornare non � presente\n"
-"(uno di %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "uso le variabili d'ambiente su %s\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"
-msgstr ""
-"urpmi versione %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Questo � software gratuito e pu� essere ridistribuito sotto i termini della "
-"GNU GPL.\n"
-"\n"
-"uso:\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Impossibile creare una directory [%s] per un bug report"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
+"Cosa pu� essere fatto con i file binari rpm quando viene usato --install-src"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "errata dichiarazione di proxy usando la linea di comando\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  nomi o file rpm passati da riga di comando verranno installati.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modalit� prolissa.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modalit� silenziosa.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
-"sistema.\n"
+"  -s             - il prossimo pacchetto � un pacchetto sorgente (uguale a --"
+"src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - impone una ricerca fuzzy (uguale a -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impone una ricerca fuzzy (uguale a --fuzzy).\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 "  -P             - do not search in provides to find package.\n"
 msgstr ""
-"  --src          - il prossimo pacchetto � un pacchetto sorgente (uguale a -"
-"s).\n"
+"  -p             - non cercare tra i provides per trovare il pacchetto.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --install-src  - installa solo il pacchetto dei sorgenti (non i binari).\n"
+"  -p             - abilita la ricerca tra i provides per trovare il "
+"pacchetto.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --clean        - rimuove gli rpm dalla cache prima di fare qualsiasi altra "
-"cosa.\n"
+"  -a             - seleziona tutte le corrispondenze da riga di comando.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - tieni in cache gli rpm inutilizzati.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - percorsi da escludere, separati da virgole.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force        - forza l'esecuzione anche se alcuni pacchetti non "
-"esistono.\n"
+"  --verify-rpm   - verifica la firma RPM prima dell'installazione\n"
+"                   (--no-verify la disabilita, abilitata come opzione "
+"predefinita).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - permette di chiedere all'utente se desidera installare\n"
-"                   dei pacchetti senza controllare le dipendenze.\n"
+"  --best-output  - sceglie l'interfaccia migliore a seconda dell'ambiente:\n"
+"                   X o modalit� testuale.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - usa X per l'interfaccia.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --allow-force  - permette di chiedere all'utente se desidera installare "
-"dei\n"
-"                   pacchetti senza controllare dipendenze e integrit�.\n"
+"  --env          - usa un ambiente specifico (tipicamente un bug \n"
+"                   report).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1175,458 +1306,493 @@ msgstr ""
 "  --bug          - produce un bug report nella directory indicata con\n"
 "                   l'argomento successivo.\n"
 
-#: ../urpmi_.c:98
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - usa un ambiente specifico (tipicamente un bug \n"
-"                   report).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - usa X per l'interfaccia.\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --best-output  - sceglie l'interfaccia migliore a seconda dell'ambiente:\n"
-"                   X o modalit� testuale.\n"
+"  --proxy-user   - specifica utente e password da utilizzare per\n"
+"                   l'autenticazione col proxy (formato: <utente:password>).\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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --verify-rpm   - verifica la firma RPM prima dell'installazione\n"
-"                   (--no-verify la disabilita, abilitata come opzione "
-"predefinita).\n"
+"  --proxy        - usa il proxy HTTP specificato, il numero di porta\n"
+"                   predefinito � 1080 (formato: <proxyhost[:port]>).\n"
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - percorsi da escludere, separati da virgole.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limita la velocit� del download.\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - seleziona tutte le corrispondenze da riga di comando.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - usa curl per recuperare i file remoti.\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - abilita la ricerca tra i provides per trovare il "
-"pacchetto.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget per recuperare file remoti.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -p             - non cercare tra i provides per trovare il pacchetto.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impone una ricerca fuzzy (uguale a --fuzzy).\n"
+"  --allow-force  - permette di chiedere all'utente se desidera installare "
+"dei\n"
+"                   pacchetti senza controllare dipendenze e integrit�.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -s             - il prossimo pacchetto � un pacchetto sorgente (uguale a --"
-"src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modalit� silenziosa.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modalit� prolissa.\n"
-
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  nomi o file rpm passati da riga di comando verranno installati.\n"
+"  --allow-nodeps - permette di chiedere all'utente se desidera installare\n"
+"                   dei pacchetti senza controllare le dipendenze.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"Cosa pu� essere fatto con i file binari rpm quando viene usato --install-src"
+"  --force        - forza l'esecuzione anche se alcuni pacchetti non "
+"esistono.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Impossibile creare una directory [%s] per un bug report"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - tieni in cache gli rpm inutilizzati.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "uso le variabili d'ambiente su %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Solo superuser � abilitato ad installare pacchetti"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - rimuove gli rpm dalla cache prima di fare qualsiasi altra "
+"cosa.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Per installare %s � richiesto uno dei seguenti pacchetti:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "E' richiesto uno dei seguenti pacchetti:"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - installa solo il pacchetto dei sorgenti (non i binari).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual � la tua scelta? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - il prossimo pacchetto � un pacchetto sorgente (uguale a -"
+"s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Spiacente, scelta errata, prova di nuovo\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - impone una ricerca fuzzy (uguale a -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Alcuni dei pacchetti richiesti non possono essere installati:\n"
-"%s\n"
-"va bene?"
+"  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
+"sistema.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "per installare %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "perch� non � soddisfatto %s"
+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 versione %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Questo � software gratuito e pu� essere ridistribuito sotto i termini della "
+"GNU GPL.\n"
+"\n"
+"uso:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "perch� manca %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "non riesco ad aggiornare il supporto \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "per conflitti con %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "non richiesto"
+msgid "unable to create medium \"%s\"\n"
+msgstr "non riesco a creare il supporto \"%s\"\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 ""
-"Alcuni pacchetti devono essere rimossi per poterne aggiornare altri:\n"
 "%s\n"
-"va bene?"
+"`with` assente per supporti ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Per soddisfare le dipendenze, saranno installati i seguenti pacchetti (%d MB)"
+"%s\n"
+"manca <relativo percorso di hdlist>\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 ""
-"Dovete essere root per installare le seguenti dipendenze:\n"
 "%s\n"
+"non c'� bisogno di fornire <relativo percorso di hdlist> con --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "non riesco a recuperare il pacchetto sorgente, interrompo"
-
-#: ../urpmi_.c:495
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% di %s completati, ETA = %s, velocit� = %s"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "recupero il file descrittivo di \"%s\"..."
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completati, velocit� = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "non posso aggiungere gli aggiornamenti della distribuzione cooker\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]"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"Per favore inserisci il supporto denominato \"%s\" nel dispositivo [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Premi Invio quando sei pronto..."
+"\n"
+"opzioni sconosciute '%s'\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "I seguenti pacchetti hanno delle firme errate"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forza la generazione dei file hdlist.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Vuoi proseguire con l'installazione?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - prova a trovare ed usare il file synthesis o hdlist\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (s/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr ""
+"  -c             - ripulisci le intestazioni dalle directory in cache.\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 ""
-"Installazione fallita, alcuni file sono mancanti:\n"
-"%s\n"
-"Potresti voler aggiornare il tuo database di urpmi"
+"  --arch         - usa una specifica architettura, quella predefinita � "
+"l'architettura\n"
+"                   della versione di Mandrake Linux installata.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Installazione fallita"
+#: ../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      - usa una specifica versione, come opzione predefinita\n"
+"                   � quella installata con la versione corrente di Mandrake\n"
+"                   Linux.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "sto distribuendo %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - usa un url specifica per ottenere la lista dei mirror, "
+"quella\n"
+"                   predefinita � %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
+#: ../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  - crea automaticamente un supporto per una parte XXX di "
+"una\n"
+"                   distribuzione, XXX pu� essere main, contrib, updates o\n"
+"                   qualsiasi altra cosa configurata ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Provo l'installazione in modo ancora pi� forzato (--force)? (s/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - crea automaticamente tutti i supporti da quelli di\n"
+"                    installazione.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "Tutto gi� installato"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - crea un suppotyo di aggiornamento.\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 versione %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Questo � software libero e pu� essere ridistribuito secondo i termini della "
-"GNU GPL.\n"
+"uso: urpmi.addmedia [opzioni] <nome> <url> [with <relative_path>]\n"
+"dove <url> � uno fra\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relativo nome di hdlist "
+"file>\n"
+"       ftp://<host>/<path> with <relativo nome di hdlist file>\n"
+"       http://<host>/<path> with <relativo nome di hdlist file>\n"
+"       removable://<path>\n"
 "\n"
-"uso:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - elenca i pacchetti disponibili.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - elenca i supporti disponibili.\n"
+"e le [opzioni] una combinazione di\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   - elenca i nodi disponibili quando si utilizza --parallel.\n"
+"la voce da rimuovere non � presente\n"
+"(uno di %s)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - elenca gli alias paralleli disponibili.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "niente da rimuovere (usa urpmi.addmedia per aggiungere un supporto)\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - seleziona tutti i supporti.\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      - estrae le intestazioni per il pacchetto selezionato dal "
-"database\n"
-"                   di urpmi allo stdout (solo root).\n"
+"uso: urpmi.removemedia [-a] <nome> ...\n"
+"dove <nome> � il nome del supporto da rimuovere.\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      - elenca tutti i pacchetti sorgenti prima del download "
-"(solo root).\n"
+"la voce da aggiornare non � presente\n"
+"(uno di %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - estende la ricerca alle dipendenze del pacchetto.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"niente da aggiornare (usa urpmi.addsupporti per aggiungere un supporto)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - rimuove il pacchetto se una versione pi� recente � gi� "
-"installata.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - risultati completi con i pacchetti da rimuovere.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - ricerca a ritroso sui requisiti del pacchetto.\n"
+"  -d             - forza il calcolo completo del file deplist.ordered.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - stampa i gruppi anche col nome.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - seleziona tutti i supporti non rimovibili.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - stampa anche versione e release col nome.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "--update       - usa solo supporti di aggiornamento.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
+"uso: urpmi.update [opzioni] <nome> ...\n"
+"dove <nome> � il nome del supporto da aggiornare.\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes pu� essere usato solo con --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versione %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"Questo � software libero e pu� essere ridistribuito secondo i termini della "
-"GNU GPL."
+"  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "uso: urpmf [options] <file>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - stampa anche versione e release col nome.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - non stampare il nome del tag (default senza il tag nella "
-"riga"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - stampa i gruppi anche col nome.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    di comando, incompatibile col modo interattivo)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - ricerca a ritroso sui requisiti del pacchetto.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - stampa tutti i tag."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - risultati completi con i pacchetti da rimuovere.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr ""
-"  --name          - stampa il nome del tag: rpm filename (presupposto senza "
-"tag"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"                    nella riga di comando ma senza nome del pacchetto)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - stampa il tag gruppo: group."
+"  -u             - rimuove il pacchetto se una versione pi� recente � gi� "
+"installata.\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - stampa la dimensione del tag: size."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - estende la ricerca alle dipendenze del pacchetto.\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - stampa il seriale del tag: serial."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - elenca tutti i pacchetti sorgenti prima del download "
+"(solo root).\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --sommario      - stampa il sommario del tag: summary."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - estrae le intestazioni per il pacchetto selezionato dal "
+"database\n"
+"                   di urpmi allo stdout (solo root).\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --descrizione   - stampa la descrizione del tag: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - elenca gli alias paralleli disponibili.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - stampa i tag provides: all provides (pi� righe)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - elenca i nodi disponibili quando si utilizza --parallel.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - stampa i tag requires: all requires (pi� righe)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - elenca i supporti disponibili.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - stampa i tag files: all files (pi� righe)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - elenca i pacchetti disponibili.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (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 ""
-"  --conflicts     - stampa i conflitti dei tag: all conflicts (pi� righe)."
-
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr "  --obsoletes     - stampa i tag obsoletes: all obsoletes (pi� righe)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - stampa i tag prereqs: all prereqs (pi� righe)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "prova urmpf --help per pi� opzioni"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "non � stata trovata una lista completa dei supporti"
+"urpmq versione %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Questo � software libero e pu� essere ridistribuito secondo i termini della "
+"GNU GPL.\n"
+"\n"
+"uso:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl fallito: terminato con %d o segnale %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Installazione fallita sul nodo %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync non � presente\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp fallito, probabilmente il nodo � irraggiungibile"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync fallito: terminato con %d o segnale %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput fallito, probabilmente il nodo � irraggiungibile"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh non � presente\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "sul nodo %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "errore di sintassi nel file di configurazione alla linea %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp fallito sul nodo %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr "il supporto \"%s\" cerca di usare una hdlist gi� usata, lo ignoro"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "l'host %s non dispone di una buona versione di urpmi"
 
 #~ msgid "Remove them all?"
 #~ msgstr "Li rimuovo tutti?"
@@ -1653,12 +1819,6 @@ msgstr "non � stata trovata una lista completa dei supporti"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - stampa questo messaggio di aiuto.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr "non riesco a costruire un file di sintesi per il supporto \"%s\""
 
@@ -1743,9 +1903,6 @@ msgstr "non � stata trovata una lista completa dei supporti"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "errata dichiarazione di proxy usando la linea di comando\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr "uso: urpmi.addmedia [options] <nome> <url> [with <path_relativo>]"
 
diff --git a/po/ja.po b/po/ja.po
index bc10623a..2c923a20 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,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: 1999-12-19 14:43+0100\n"
 "Last-Translator: Taisuke Yamada <tai@imasy.or.jp>\n"
 "Language-Team: Japanese\n"
@@ -14,1491 +14,1657 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "%s �򥤥󥹥ȡ������\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 "Yy�٣��ϥ�"
 
-#: ../_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 "Nn�Σ��"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf ������� %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr ""
+
+#: placeholder.h:20
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr "���ꤵ�줿�ѥå�������%s�ˤ򥤥󥹥ȡ��뤷�Ƥ��ޤ���\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
+msgstr ""
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "��������Ǥ��礦����"
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "������ˡ: urpmf [�ե�����̾]"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "�Ϥ���³�Ԥ����"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "����������ߤ����"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_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 "Nn�Σ��"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_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 "Yy�٣��ϥ�"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
 
-# ��
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (�Ϥ�(Y)/������(n)) [�Ϥ�] "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ���ޥ�ɤ����Ĥ���ޤ���Ǥ���\n"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr ""
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: ../urpm.pm_.c:226
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr ""
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:288
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:556
-#, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:572
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr ""
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr ""
+
+#: ../_irpm:1
+#, c-format
+msgid "%s: command not found\n"
+msgstr "%s: ���ޥ�ɤ����Ĥ���ޤ���Ǥ���\n"
+
+# ��
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid " (Y/n) "
+msgstr " (�Ϥ�(Y)/������(n)) [�Ϥ�] "
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Cancel"
+msgstr "����������ߤ����"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "�Ϥ���³�Ԥ����"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "��������Ǥ��礦����"
+
+#: ../_irpm:1
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr "���ꤵ�줿�ѥå�������%s�ˤ򥤥󥹥ȡ��뤷�Ƥ��ޤ���\n"
 
-#: ../urpm.pm_.c:578
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
+msgid "installing %s\n"
+msgstr "%s �򥤥󥹥ȡ������\n"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "unable to open rpmdb"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "unable to access rpm file [%s]"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "unable to install package %s"
+msgstr ""
+"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "unable to remove package %s"
+msgstr ""
+"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
+#, c-format
+msgid "Preparing..."
+msgstr ""
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "...retrieving failed: %s"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:622
-#, fuzzy, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, c-format
+msgid "...retrieving done"
+msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
+#, c-format
+msgid "malformed input: [%s]"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "unable to access medium \"%s\""
 msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "urpmi database locked"
+msgstr "�ѥå������ǡ����١����θ����˼��Ԥ��ޤ���\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
+
+#: ../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)"
 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 "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "The following packages contain %s: %s"
+msgstr "%s �ϼ��Υѥå���������ˤ���ޤ�: %s\n"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "write config file [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "no package named %s"
+msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to register rpm file"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "retrieving rpm file [%s] ..."
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "invalid rpm file name [%s]"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "unmounting %s"
+msgstr "%s �򥤥󥹥ȡ������\n"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "%s �򥤥󥹥ȡ������\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../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 "found %d headers in cache"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../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
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "building hdlist [%s]"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
-
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
+msgid "reading headers from medium \"%s\""
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "added medium %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "nothing written in list file for \"%s\""
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:933
-#, fuzzy
-msgid "unable to access first installation medium"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
 msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:937
-#, fuzzy
-msgid "copying hdlists file..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../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 "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
-
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
-#, fuzzy
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to parse hdlist file of \"%s\""
 msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../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 "retrieve of source hdlist (or synthesis) failed"
 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"
+msgid "examining MD5SUM file"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:975
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
-
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "\"%s\""
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
+msgid "retrieving description file of \"%s\"..."
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
+msgid "no rpm files found from [%s]"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-#, fuzzy
-msgid "urpmi database locked"
-msgstr "�ѥå������ǡ����١����θ����˼��Ԥ��ޤ���\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "reading rpm files from [%s]"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "copy of [%s] failed"
 msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr ""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
+msgid "removing medium \"%s\""
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "selecting multiple media: %s"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no rpm files found from [%s]"
+msgid "trying to select inexistent medium \"%s\""
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving hdlists file..."
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "copying hdlists file..."
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access first installation medium"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "added medium %s"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
 msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
+msgid "unable to use parallel option \"%s\""
 msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
+#, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
+msgid "found parallel handler for nodes: %s"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr ""
-
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
+msgid "write config file [%s]"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "building hdlist [%s]"
+msgid "unable to write config file [%s]"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "mounting %s"
-msgstr "%s �򥤥󥹥ȡ������\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "%s �򥤥󥹥ȡ������\n"
-
-#: ../urpm.pm_.c:1833
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
-
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr ""
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr ""
-
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no package named %s"
-msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s �ϼ��Υѥå���������ˤ���ޤ�: %s\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:2105 ../urpm.pm_.c:2137 ../urpm.pm_.c:2159
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../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 "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
+msgid "medium \"%s\" trying to use an already used list, 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 "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "syntax error in config file at line %s"
 msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr ""
-
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
-#, fuzzy, c-format
-msgid "unable to remove package %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
-"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
 
-#: ../urpm.pm_.c:2457
-#, fuzzy, c-format
-msgid "unable to install package %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
 msgstr ""
-"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
+msgid "copy failed: %s"
 msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
+msgid "unable to handle protocol: %s"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../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"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "��¸�ط��Τ��ᡢ���Υѥå������⥤�󥹥ȡ��뤷�ޤ� (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme_.c:64
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
 msgstr ""
-"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
-"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
 
-#: ../urpme_.c:93
-#, c-format
-msgid "removing package %s will break your system"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
+"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
+"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
 
-#: ../urpme_.c:105
-#, fuzzy, c-format
+#: ../urpme:1 ../urpmi:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
-msgstr "��¸�ط��Τ��ᡢ���Υѥå������⥤�󥹥ȡ��뤷�ޤ� (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
 
-#: ../urpme_.c:113
-msgid "Removing failed"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../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 ""
 
-#: ../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_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr ""
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"������ˡ: urpmi.addmedia [--update] <name> <url>\n"
-"�����ǡ�<url> �ϰʲ��Τ����Τ����줫�η����Ǥ���\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_<device>://<path>\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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "���٤ƴ��˥��󥹥ȡ��뤵��Ƥ��ޤ�"
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
 
-#: ../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"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
+"���٥��󥹥ȡ�����ߤޤ�������--force �����Ǥ��� (�Ϥ�(y)/������(N)) [����"
+"��] "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
+"��¸�ط����ǧ�����˥��󥹥ȡ�����ߤޤ����� (�Ϥ�(y)/������(N)) [������] "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "%s �򥤥󥹥ȡ������\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../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"
+# ��
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (�Ϥ�(Y)/������(n)) [�Ϥ�] "
+
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "%s �ϼ��Υѥå���������ˤ���ޤ�: %s\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "����ä���ϥ꥿���󥭡��򲡤��Ʋ�������"
+
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "��ǥ�����%s�ˤ� %s ���������Ʋ�������"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "�������ѥå�����������Ǥ��ޤ���Ǥ��������Τޤ޽�λ���ޤ�"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "��¸�ط��Τ��ᡢ���Υѥå������⥤�󥹥ȡ��뤷�ޤ� (%d MB)"
 
-#: ../urpmi.addmedia_.c:69
+#: ../urpmi: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"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:72
+#: ../urpmi:1
+#, fuzzy, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
+"���åץ��졼�ɤΤ���ˤϤ����Ĥ��Υѥå�������������\n"
+"ɬ�פ�����ޤ��ʤ����̤�����Ǥ���\n"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "in order to install %s"
 msgstr ""
-"%s\n"
-"��<relative path of hdlist>����ʬ�λ��꤬����ޤ���\n"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
-"%s\n"
-"��<relative path of hdlist>����ʬ�λ��꤬����ޤ���\n"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
-msgstr ""
-"%s\n"
-"��with ...�װʹߤλ��꤬ ftp �ˤĤ��Ƥ�ɬ�פǤ�\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "ͭ��������ǤϤ���ޤ��󡣤⤦���٤��ꤤ���ޤ�\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-
-#: ../urpmi.removemedia_.c:34
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"������ˡ: urpmi.removemedia [-a] <name> ...\n"
-"������ <name> �Ϻ���оݤΥ�ǥ�����̾���Ǥ���\n"
-"  -a    ���٤ƤΥ�ǥ��������򤷤ޤ�\n"
-"\n"
-"���ݡ��Ȥ���Ƥ��ʤ����ץ����Ǥ�: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "�ɤ�����Ӥޤ�����(1-%d) "
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr "̤�ΤΥ��ץ�����%s�ˤ����ꤵ��Ƥ��ޤ�\n"
+msgid "One of the following packages is needed to install %s:"
+msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
 msgstr ""
-"\"�����ɬ�פʤ�ΤϤ���ޤ���\\n\"\n"
-"\"��ǥ������ɲä������ urpmi.addmedia ����Ѥ��Ʋ�������\\n\"\n"
+"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"����оݤ����Ĥ���ޤ���\n"
-"(%s ����Τ����줫)\n"
-
-#: ../urpmi.update_.c:60
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"������ˡ: urpmi.removemedia [-a] <name> ...\n"
-"������ <name> �Ϻ���оݤΥ�ǥ�����̾���Ǥ���\n"
-"  -a    ���٤ƤΥ�ǥ��������򤷤ޤ�\n"
-"\n"
-"���ݡ��Ȥ���Ƥ��ʤ����ץ����Ǥ�: %s\n"
-
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"���åץǡ��Ȥ�ɬ�פʤ�ΤϤ���ޤ���\n"
-"��ǥ������ɲä������ urpmi.addmedia ����Ѥ��Ʋ�������\n"
+"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
+"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"���åץǡ����оݤ����Ĥ���ޤ���\n"
-"(%s ����Τ����줫)\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 "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../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 "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:197
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
-"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
+#: ../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"
 msgstr ""
-"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
-
-#: ../urpmi_.c:349
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
 
-#: ../urpmi_.c:358
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "�ɤ�����Ӥޤ�����(1-%d) "
+msgid "unable to update medium \"%s\"\n"
+msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "ͭ��������ǤϤ���ޤ��󡣤⤦���٤��ꤤ���ޤ�\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
 "%s\n"
-"do you agree ?"
-msgstr ""
-
-#: ../urpmi_.c:402
-#, fuzzy, c-format
-msgid "in order to install %s"
+"`with' missing for ftp media\n"
 msgstr ""
-"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
+"%s\n"
+"��with ...�װʹߤλ��꤬ ftp �ˤĤ��Ƥ�ɬ�פǤ�\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
+"%s\n"
+"��<relative path of hdlist>����ʬ�λ��꤬����ޤ���\n"
 
-#: ../urpmi_.c:409
-#, c-format
-msgid "due to missing %s"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
+"%s\n"
+"��<relative path of hdlist>����ʬ�λ��꤬����ޤ���\n"
 
-#: ../urpmi_.c:414
-#, c-format
-msgid "due to conflicts with %s"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:421
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
-msgstr ""
-"���åץ��졼�ɤΤ���ˤϤ����Ĥ��Υѥå�������������\n"
-"ɬ�פ�����ޤ��ʤ����̤�����Ǥ���\n"
+"\n"
+"unknown options '%s'\n"
+msgstr "̤�ΤΥ��ץ�����%s�ˤ����ꤵ��Ƥ��ޤ�\n"
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "��¸�ط��Τ��ᡢ���Υѥå������⥤�󥹥ȡ��뤷�ޤ� (%d MB)"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "�������ѥå�����������Ǥ��ޤ���Ǥ��������Τޤ޽�λ���ޤ�"
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "��ǥ�����%s�ˤ� %s ���������Ʋ�������"
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "����ä���ϥ꥿���󥭡��򲡤��Ʋ�������"
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "%s �ϼ��Υѥå���������ˤ���ޤ�: %s\n"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+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 ""
 
-# ��
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (�Ϥ�(Y)/������(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"
-msgstr ""
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "%s �򥤥󥹥ȡ������\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"��¸�ط����ǧ�����˥��󥹥ȡ�����ߤޤ����� (�Ϥ�(y)/������(N)) [������] "
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
+#: ../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 ""
-"���٥��󥹥ȡ�����ߤޤ�������--force �����Ǥ��� (�Ϥ�(y)/������(N)) [����"
-"��] "
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "���٤ƴ��˥��󥹥ȡ��뤵��Ƥ��ޤ�"
-
-#: ../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"
-"\n"
-"usage:\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+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"
 msgstr ""
+"������ˡ: urpmi.addmedia [--update] <name> <url>\n"
+"�����ǡ�<url> �ϰʲ��Τ����Τ����줫�η����Ǥ���\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_<device>://<path>\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 ""
+"����оݤ����Ĥ���ޤ���\n"
+"(%s ����Τ����줫)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"\"�����ɬ�פʤ�ΤϤ���ޤ���\\n\"\n"
+"\"��ǥ������ɲä������ urpmi.addmedia ����Ѥ��Ʋ�������\\n\"\n"
 
-#: ../urpmq_.c:51
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:53
+#: ../urpmi.removemedia:1
+#, fuzzy, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"������ˡ: urpmi.removemedia [-a] <name> ...\n"
+"������ <name> �Ϻ���оݤΥ�ǥ�����̾���Ǥ���\n"
+"  -a    ���٤ƤΥ�ǥ��������򤷤ޤ�\n"
+"\n"
+"���ݡ��Ȥ���Ƥ��ʤ����ץ����Ǥ�: %s\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"���åץǡ����оݤ����Ĥ���ޤ���\n"
+"(%s ����Τ����줫)\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"���åץǡ��Ȥ�ɬ�פʤ�ΤϤ���ޤ���\n"
+"��ǥ������ɲä������ urpmi.addmedia ����Ѥ��Ʋ�������\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"������ˡ: urpmi.removemedia [-a] <name> ...\n"
+"������ <name> �Ϻ���оݤΥ�ǥ�����̾���Ǥ���\n"
+"  -a    ���٤ƤΥ�ǥ��������򤷤ޤ�\n"
+"\n"
+"���ݡ��Ȥ���Ƥ��ʤ����ץ����Ǥ�: %s\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf ������� %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM�ե������%s�ˤ��ɤळ�Ȥ�����ޤ���Ǥ���\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
+"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
+"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "������ˡ: urpmf [�ե�����̾]"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr ""
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: RPM�ե������%s�ˤ��ɤळ�Ȥ�����ޤ���Ǥ���\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi �ϥ��󥹥ȡ��뤵��Ƥ��ޤ���"
 
diff --git a/po/ka.po b/po/ka.po
index 286c8775..b8b43765 100644
--- a/po/ka.po
+++ b/po/ka.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-29 23:47+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
 "Language-Team: Georgian\n"
@@ -14,1467 +14,1624 @@ 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\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 "yYkKxXხ"
 
-#: ../_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 "nNaAა"
+
+#: placeholder.h:18
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "urpmf version %s"
 msgstr ""
-"პაკეტების ავტპმატური ინსტალაცია...\n"
-"თქვენ მოინდომეთ %s პაკეტის ინსტალირება\n"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "თანახმა ხართ?"
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr ""
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "ო-ქეი"
+#: placeholder.h:20
+msgid ""
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
+msgstr ""
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "გამოქცევა"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr ""
 
-#: ../_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 "nNaAა"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_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 "yYkKxXხ"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (ხ/ა) [ხ] "
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ბრძანება ვერ ვიპოვე\n"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "უცნობი ვებცდა `%s' !!!\n"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s-ისთვის უცნობი პროტოკოლია განსაზღვრული"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr ""
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "ვერ ვიპოვე ვებცდა (webfetch), ანუ ამჟამად curl ან wget\n"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr ""
 
-#: ../urpm.pm_.c:226
-#, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ვერ ვუმკლავდები პროტოკოლს: %s"
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr ""
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...კოპირება ჩაიშალა"
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr ""
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget აკლია\n"
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr ""
 
-#: ../urpm.pm_.c:288
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl აკლია\n"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
 
-#: ../urpm.pm_.c:556
-#, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
-"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
 
-#: ../urpm.pm_.c:572
-#, c-format
+#: placeholder.h:35
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
-"ვერ ვუმკლავდები მედიუმს \"%s\", ვინაიდან list ფაილს უკვე სხვა მედიუმი იყენებს"
 
-#: ../urpm.pm_.c:578
-#, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
-"ვერ გამოვიყენებ სახელს \"%s\" უსახელპო მედიასათვის, რადგან იგი უკვე "
-"გამოყენებულია"
 
-#: ../urpm.pm_.c:585
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "ვერ ვითვალისწინებ მედიას \"%s\" რადგან list ფაილი [%s] არ არსებობს"
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
 
-#: ../urpm.pm_.c:589
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ვერ დავადგინე მედია ამ hdlist ფაილისთვის [%s]"
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr ""
 
-#: ../urpm.pm_.c:598
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr ""
 
-#: ../urpm.pm_.c:600
+#: ../_irpm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ვერ ვუკავშირდები list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid "%s: command not found\n"
+msgstr "%s: ბრძანება ვერ ვიპოვე\n"
 
-#: ../urpm.pm_.c:614
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "ვცდილობ გადავახტე არსებულ მედიას \"%s\"-ს, თავიდან ვიშორებ"
+msgid " (Y/n) "
+msgstr " (ხ/ა) [ხ] "
 
-#: ../urpm.pm_.c:622
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ვერ ვპოულობ hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid "Cancel"
+msgstr "გამოქცევა"
 
-#: ../urpm.pm_.c:628
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ვერ ვპოულობ list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid "Ok"
+msgstr "ო-ქეი"
 
-#: ../urpm.pm_.c:651
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "არასწორი list ფაილის \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid "Is this OK?"
+msgstr "თანახმა ხართ?"
 
-#: ../urpm.pm_.c:659
+#: ../_irpm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ვერ ვამოწმებ list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"პაკეტების ავტპმატური ინსტალაცია...\n"
+"თქვენ მოინდომეთ %s პაკეტის ინსტალირება\n"
 
-#: ../urpm.pm_.c:690
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "ძალიან ბევრი mount სახელი შეცვლადი  მედიუმისათვის \"%s\""
+msgid "installing %s\n"
+msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ვიღებ შეცვლად მოწყობილობას როგორც \"%s\""
+msgid "unable to open rpmdb"
+msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "ვიყენებ სხვანაირ შეცვლად მოწყობილობას [%s] \"%s\"-სთვის"
+msgid "unable to access rpm file [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ვერ ვიპოვე მდებარეობა შეცვლადი მედიუმისათვის \"%s\""
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+msgid "%s is needed by %s"
+msgstr ""
 
-#: ../urpm.pm_.c:735
-#, c-format
-msgid "write config file [%s]"
-msgstr "დაწერე საკონფიგურაციო ფაილი [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpm.pm_.c:755
-#, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "ვამოწმებ პარალელურ სათავეს ფაილში [%s]"
+msgid "Preparing..."
+msgstr ""
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "ვიპოვე პარალელური სათაე (handler) nodes:-ისთვის %s"
+msgid "...retrieving failed: %s"
+msgstr "...გამოძახება ჩაიშალა: %s"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "ვიყენებ მიმაგრებულ მედიას პარალელური რეჟიმისათვის: %s"
+msgid "...retrieving done"
+msgstr "...გამოძახება დასრულდა"
 
-#: ../urpm.pm_.c:784
-#, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "malformed input: [%s]"
 msgstr ""
-"--synthesis პარამეტრი ვერ გამოიყენება --media, --update ან --parallel "
-"პარამეტრებთან ერთად"
 
-#: ../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]"
-msgstr "ვამოწმებ hdlist ფაილს [%s]"
+msgid "unable to access medium \"%s\""
+msgstr "ვერ ვუკავშირდები მედიას \"%s\""
 
-#: ../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]"
-msgstr "ვამოწმებ synthesis ფაილს [%s]"
+msgid "urpmi database locked"
+msgstr "urpmi მონაცემთა ბაზა ჩაკეტილია"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
 
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
-#, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "მედიუმი \"%s\" უკვე არსებობს"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ვერ ვუკავშირდები მედიას \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "მედიუმი \"%s\" უკვე არსებობს"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "დამატებული მედიუმი %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:933
-msgid "unable to access first installation medium"
-msgstr "ვერ ვიპოვე პირველი საინსტალაციო მედიუმი"
+#: ../urpm.pm:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "hdlists ფაილის კოპირება..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...კოპირება დასრულდა"
+#: ../urpm.pm:1 ../urpme:1
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...კოპირება დასრულდა"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../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 "error registering local packages"
 msgstr ""
-"ვერ ვპოულობ პირველ საინსტალაციო მედიუმს (ვერ მივაკვლიე Mandrake/base/hdlists "
-"ფაილს)"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "ვიძახებ hdlists ფაილს..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...გამოძახება დასრულდა"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...გამოძახება ჩაიშალა: %s"
+msgid "invalid rpm file name [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "არასწორი hdlist აღწერილობა \"%s\" hdlists-ის ფაილში"
+msgid "no entries relocated in depslist"
+msgstr ""
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "ვცდილობ არარსებული მედიუმის ამორჩევას \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr ""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unmounting %s"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "ვირჩევ მრავალ მედიას: %s"
+msgid "removing %d obsolete headers in cache"
+msgstr ""
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "ვაგდებ მედიას \"%s\""
+msgid "found %d headers in cache"
+msgstr ""
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi მონაცემთა ბაზა ჩაკეტილია"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ვერ ვუკავშირდები მედიას \"%s\""
+msgid "examining hdlist file [%s]"
+msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
+msgid "examining synthesis file [%s]"
+msgstr "ვამოწმებ synthesis ფაილს [%s]"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
+msgid "building hdlist [%s]"
+msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy of [%s] failed"
-msgstr "...კოპირება ჩაიშალა"
+msgid "reading headers from medium \"%s\""
+msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "ვამოწმებ hdlist ფაილს [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
+#, c-format
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
+msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "ვამოწმებ hdlist ფაილს [%s]"
+msgid "writing list file for medium \"%s\""
+msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "unable to write list file of \"%s\""
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1285
-#, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
-
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
-
-#: ../urpm.pm_.c:1425
-#, fuzzy
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
-#, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid "examining MD5SUM file"
+msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "retrieving description file of \"%s\"..."
 msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "building hdlist [%s]"
+msgid "reading rpm files from [%s]"
 msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
+#, c-format
+msgid "...copying done"
+msgstr "...კოპირება დასრულდა"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+msgid "...copying failed"
+msgstr "...კოპირება დასრულდა"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy of [%s] failed"
+msgstr "...კოპირება ჩაიშალა"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr ""
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr ""
+msgid "removing medium \"%s\""
+msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpm.pm_.c:1798
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "ვაინსტალირებ: %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "selecting multiple media: %s"
+msgstr "ვირჩევ მრავალ მედიას: %s"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr ""
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "ვცდილობ არარსებული მედიუმის ამორჩევას \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
+"ვერ ვპოულობ პირველ საინსტალაციო მედიუმს (ვერ მივაკვლიე Mandrake/base/hdlists "
+"ფაილს)"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "არასწორი hdlist აღწერილობა \"%s\" hdlists-ის ფაილში"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving hdlists file..."
 msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr ""
+msgid "copying hdlists file..."
+msgstr "hdlists ფაილის კოპირება..."
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access first installation medium"
+msgstr "ვერ ვიპოვე პირველი საინსტალაციო მედიუმი"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "added medium %s"
+msgstr "დამატებული მედიუმი %s"
 
-#: ../urpm.pm_.c:1960
-#, fuzzy, c-format
-msgid "no package named %s"
-msgstr "არც ერთ პაკეტს არ ქვია %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" already exists"
+msgstr "მედიუმი \"%s\" უკვე არსებობს"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s შედმეგ პაკეტებშია: %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../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 "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
+"--synthesis პარამეტრი ვერ გამოიყენება --media, --update ან --parallel "
+"პარამეტრებთან ერთად"
 
-#: ../urpm.pm_.c:2147
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
 
-#: ../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)"
-msgstr ""
+msgid "using associated media for parallel mode: %s"
+msgstr "ვიყენებ მიმაგრებულ მედიას პარალელური რეჟიმისათვის: %s"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+msgid "found parallel handler for nodes: %s"
+msgstr "ვიპოვე პარალელური სათაე (handler) nodes:-ისთვის %s"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr ""
+msgid "examining parallel handler in file [%s]"
+msgstr "ვამოწმებ პარალელურ სათავეს ფაილში [%s]"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
-#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "მედიუმი \"%s\" უკვე არსებობს"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpm.pm_.c:2249
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ვერ ვუკავშირდები მედიას \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "write config file [%s]"
+msgstr "დაწერე საკონფიგურაციო ფაილი [%s]"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
+msgid "unable to write config file [%s]"
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr ""
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ვერ ვიპოვე მდებარეობა შეცვლადი მედიუმისათვის \"%s\""
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "ვიყენებ სხვანაირ შეცვლად მოწყობილობას [%s] \"%s\"-სთვის"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "ვიღებ შეცვლად მოწყობილობას როგორც \"%s\""
 
-#: ../urpm.pm_.c:2448
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "ძალიან ბევრი mount სახელი შეცვლადი  მედიუმისათვის \"%s\""
 
-#: ../urpm.pm_.c:2457
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ვერ ვამოწმებ list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr ""
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "არასწორი list ფაილის \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ვერ ვპოულობ list ფაილს \"%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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ვერ ვპოულობ hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "ვცდილობ გადავახტე არსებულ მედიას \"%s\"-ს, თავიდან ვიშორებ"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ვერ ვუკავშირდები list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "ინსტალაცია ჩაიშალა"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "ინსტალაცია ჩაიშალა"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ვერ დავადგინე მედია ამ hdlist ფაილისთვის [%s]"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
-#, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "ინსტალაცია ჩაიშალა"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "ვერ ვითვალისწინებ მედიას \"%s\" რადგან list ფაილი [%s] არ არსებობს"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
+"ვერ გამოვიყენებ სახელს \"%s\" უსახელპო მედიასათვის, რადგან იგი უკვე "
+"გამოყენებულია"
 
-#: ../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"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"ვერ ვუმკლავდები მედიუმს \"%s\", ვინაიდან list ფაილს უკვე სხვა მედიუმი იყენებს"
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
+"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
+"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
+"ეთქვა"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "სინტაქსური შეცდომა საკონფიგურაციო ფაილში. სტრიქონი: %s"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpme_.c:64
+#: ../urpm.pm:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
 
-#: ../urpme_.c:83
-#, fuzzy
-msgid "unknown package"
-msgstr "არც ერთ პაკეტს არ ქვია %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh აკლია\n"
 
-#: ../urpme_.c:83
-#, fuzzy
-msgid "unknown packages"
-msgstr "არც ერთ პაკეტს არ ქვია %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync is missing\n"
+msgstr "rsync აკლია\n"
 
-#: ../urpme_.c:93
+#: ../urpm.pm:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr ""
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl აკლია\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr "wget აკლია\n"
 
-#: ../urpme_.c:105
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "...კოპირება ჩაიშალა"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "ვერ ვუმკლავდები პროტოკოლს: %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "ვერ ვიპოვე ვებცდა (webfetch), ანუ ამჟამად curl ან wget\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "%s-ისთვის უცნობი პროტოკოლია განსაზღვრული"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "უცნობი ვებცდა `%s' !!!\n"
+
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr ""
+
+#: ../urpme:1
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be removed (%d "
 "MB)"
 msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, c-format
-msgid ""
-"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"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpme:1
+#, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpmf_.c:36
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpmf_.c:39
+#: ../urpme:1 ../urpmi:1
+#, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
-msgstr ""
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\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 ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpme: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 ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
+#: ../urpmf:1 ../urpmq:1
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:115
+#: ../urpmf:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../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 "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:57 ../urpmi.update_.c:66 ../urpmi_.c:92 ../urpmq_.c:58
+#: ../urpmf: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"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../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"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../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 "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:72
+#: ../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 ""
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
+
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "ვაინსტალირებ: %s\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 ""
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (ხ/ა) [ხ] "
+
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "%s შედმეგ პაკეტებშია: %s\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
+
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
 msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../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 ""
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "თქვენი არჩევანი? (1-%d) "
+
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
 msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../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 "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../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 "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
+#: ../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"
 msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
 
-#: ../urpmi_.c:349
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-
-#: ../urpmi_.c:358
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "თქვენი არჩევანი? (1-%d) "
+msgid "unable to update medium \"%s\"\n"
+msgstr ""
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
 "%s\n"
-"do you agree ?"
+"`with' missing for ftp media\n"
 msgstr ""
 
-#: ../urpmi_.c:402
-#, fuzzy, c-format
-msgid "in order to install %s"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
 
-#: ../urpmi_.c:407
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "ვიძახებ hdlists ფაილს..."
+
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:416
-msgid "unrequested"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../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 ?"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr ""
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
-
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+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 ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:507
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "%s შედმეგ პაკეტებშია: %s\n"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../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 ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (ხ/ა) [ხ] "
-
-#: ../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"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "ინსტალაცია ჩაიშალა"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "ვაინსტალირებ: %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "უკვე ყველაფერი ჩაწერილია"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: ../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"
-msgstr ""
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:51
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr ""
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr ""
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr ""
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (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 ""
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "ინსტალაცია ჩაიშალა"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
-
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync აკლია\n"
-
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
-
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh აკლია\n"
-
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "სინტაქსური შეცდომა საკონფიგურაციო ფაილში. სტრიქონი: %s"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "ინსტალაცია ჩაიშალა"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
-#~ "ეთქვა"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 56ef1e73..798c114e 100644
--- a/po/ko.po
+++ b/po/ko.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: 2001-09-22 03:14+0900\n"
 "Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -13,1501 +13,1650 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "%s ��ġ ��...\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 "Yy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "urpmf version %s"
+msgstr "urpmf ���� %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
 msgstr ""
-"��Ű�� �ڵ� ��ġ...\n"
-"���� ��Ű�� %s�� ��ġ�� ��û�߽��ϴ�.\n"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "����ұ��?"
+#: placeholder.h:20
+msgid ""
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
+msgstr ""
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ȯ��"
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "����: urpmf [�ɼǵ�] <����>"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "���"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_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 "Nn"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_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 "Yy"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (Y/n) "
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ���ɾ ã�� �� �����ϴ�.\n"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: ../urpm.pm_.c:226
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "��� ������ ������ �� �����ϴ�: %s"
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr ""
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "��ġ ����."
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr ""
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:288
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:556
-#, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "��ü ��%s���� �̹� ���Ǵ� ����� ����Ϸ� �մϴ�. ��ü ���õ�."
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
 
-#: ../urpm.pm_.c:572
-#, c-format
+#: placeholder.h:36
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
-"��� ������ �ٸ� ��ü�� ���� �̹� ���ǰ� �ֱ� ������, ��ü ��%s���� ����� "
-"�� �����ϴ�."
 
-#: ../urpm.pm_.c:578
-#, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "��ü �̸� ��%s���� ����� �� �����ϴ�. ���� ��� ���Դϴ�."
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
 
-#: ../urpm.pm_.c:585
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "�� ���� �ɼ��� ������ urpmf --help��� ġ����."
+
+#: placeholder.h:40
+msgid "no full media list was found"
 msgstr ""
-"��� ���� [%2$s]�� �������� �ʱ� ������, ��ü��%1$s���� ó���� �� �����ϴ�."
 
-#: ../urpm.pm_.c:589
+#: ../_irpm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "�� ������� [%s]�� ��ü�� ������ �� �����ϴ�."
+msgid "%s: command not found\n"
+msgstr "%s: ���ɾ ã�� �� �����ϴ�.\n"
 
-#: ../urpm.pm_.c:598
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm_.c:600
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
+msgid "Cancel"
+msgstr "���"
 
-#: ../urpm.pm_.c:614
-#, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "�������� �ʴ� ��ü��%s�� ���� �õ�"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ȯ��"
 
-#: ../urpm.pm_.c:622
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
+msgid "Is this OK?"
+msgstr "����ұ��?"
 
-#: ../urpm.pm_.c:628
+#: ../_irpm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"��Ű�� �ڵ� ��ġ...\n"
+"���� ��Ű�� %s�� ��ġ�� ��û�߽��ϴ�.\n"
 
-#: ../urpm.pm_.c:651
-#, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "%s ��ġ ��...\n"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
+msgid "unable to open rpmdb"
+msgstr "RPM ������ ����� �� �����ϴ�."
 
-#: ../urpm.pm_.c:690
-#, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "��%s����ü�� ������ �� �����ϴ�.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "RPM ���ϡ�%s���� ������ �� �����ϴ�."
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "%s is needed by %s"
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "��%s����ü�� ������ �� �����ϴ�.\n"
+msgid "unable to install package %s"
+msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
 
-#: ../urpm.pm_.c:716
-#, c-format
-msgid "unable to write config file [%s]"
-msgstr "���� ���� [%s]�� ����� �� �����ϴ�."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "���� ���� [%s]�� ���"
+msgid "Preparing..."
+msgstr ""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "RPM ���ϡ�%s���� ������ �� �����ϴ�."
+msgid "...retrieving failed: %s"
+msgstr "[%s] ���� ��"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "��� ���� [%s] �д� ��"
+msgid "...retrieving done"
+msgstr "[%s] ���� ��"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "��� ���� [%s] �д� ��"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "[%s] ���� ��"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "malformed input: [%s]"
+msgstr "�߸��� ������ �Է�: [%s]"
 
-#: ../urpm.pm_.c:784
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "��%s����ü�� ������Ʈ�� �� �����ϴ�.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access medium \"%s\""
+msgstr "��ü��%s���� ������ �� �����ϴ�."
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../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
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "��� ���� [%s] �д� ��"
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
+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
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "������� ���� [%s] �б�"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "��ü [%s]�� ���õ��� �ʾҽ��ϴ�."
 
-#: ../urpm.pm_.c:825
-#, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "��ü��%s���� ���� ��� �ռ� ���� ���� �Ϸ�."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "��ü��%2$s������ RPM ���ϡ�%1$s���� ���� �� �����ϴ�."
 
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
-#, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "��ü��%s���� ���� ��� �ռ� ���� ���� �Ϸ�."
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
+msgstr "��Ű�� %s�� ã�� �� �����ϴ�."
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "RPM ������ ����� �� �����ϴ�."
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "��ü��%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:918
-#, fuzzy, c-format
-msgid "added medium %s"
-msgstr "�������� �ʴ� ��ü��%s���� ���� �õ�"
+#: ../urpm.pm:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "������ ���� �̸� ��%s���� ���� ���� ���� ��Ű���� �����մϴ�."
 
-#: ../urpm.pm_.c:933
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "��ü��%2$s������ RPM ���ϡ�%1$s���� ���� �� �����ϴ�."
 
-#: ../urpm.pm_.c:937
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "��� ���� [%s] �д� ��"
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "���� ��Ű������ %s�� ��� �ֽ��ϴ�: %s"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying done"
-msgstr "[%s] ���� ��"
+#: ../urpm.pm:1
+#, c-format
+msgid "no package named %s"
+msgstr "%s��� ��Ű���� �����ϴ�."
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "[%s] ���� ��"
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr "���� ���� ��� ����"
 
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
-#, fuzzy
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "RPM ���ϡ�%s���� ������ �� �����ϴ�."
 
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
 msgstr "[%s] ���� ��"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-#, fuzzy
-msgid "...retrieving done"
-msgstr "[%s] ���� ��"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "��ȿ���� ���� RPM ���� �̸� [%s]"
 
-#: ../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 "[%s] ���� ��"
+msgid "no entries relocated in depslist"
+msgstr "������Ͽ��� %s �׸� ��ġ ������"
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
+msgid "relocated %s entries in depslist"
+msgstr "������Ͽ��� %s �׸� ��ġ ������"
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "�������� �ʴ� ��ü��%s�� ���� �õ�"
+msgid "unmounting %s"
+msgstr "%s ����Ʈ ���� ��"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr ""
+msgid "mounting %s"
+msgstr "%s ����Ʈ ��"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "ij������ %d ���� ��� ���� ��"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "ij������ %d ����� ã�ҽ��ϴ�."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "��ü��%s���� ���� ��� �ռ� ���� ���� �Ϸ�."
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "�������� �ʴ� ��ü��%s�� ���� �õ�"
+msgid "examining hdlist file [%s]"
+msgstr "��� ���� [%s] �д� ��"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "�������� �ʴ� ��ü��%s���� ���� �õ�"
+msgid "examining synthesis file [%s]"
+msgstr "������� ���� [%s] �б�"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "building hdlist [%s]"
+msgstr "��� [%s] ���� ��"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "�������� �ʴ� ��ü��%s���� ���� �õ�"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "��ü��%s���� ������ �� �����ϴ�."
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "��ü��%s���� ���� ��� �ռ� ���� ���� �Ϸ�."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "nothing written in list file for \"%s\""
 msgstr "��� ���Ͽ���%s���� ���� ����� �����ϴ�."
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "��� ���Ͽ���%s���� ���� ����� �����ϴ�."
+msgid "writing list file for medium \"%s\""
+msgstr "��ü��%s���� ���� ��� ������ ã�� �� �����ϴ�."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "[%s] ���� ����."
+msgid "unable to write list file of \"%s\""
+msgstr "��%s���� ��� ������ ����� �� �����ϴ�."
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "��%s���� ��������� �м��� �� �����ϴ�."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "��ü��%s���� ���� ��� ������ ã�� �� �����ϴ�."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "��� ���� [%s] �д� ��"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr "��� ���Ͽ���%s���� ���� ����� �����ϴ�."
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "[%s] ���� ��"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving description file of \"%s\"..."
+msgstr "[%s] ���� ��"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no rpm files found from [%s]"
 msgstr "[%s]���� RPM ������ ã�� �� �����ϴ�."
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "��ü��%2$s������ RPM ���ϡ�%1$s���� ���� �� �����ϴ�."
 
-#: ../urpm.pm_.c:1272
-#, c-format
-msgid "no rpm files found from [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
 msgstr "[%s]���� RPM ������ ã�� �� �����ϴ�."
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid "...copying done"
 msgstr "[%s] ���� ��"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "...copying failed"
 msgstr "[%s] ���� ��"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "��� ���Ͽ���%s���� ���� ����� �����ϴ�."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "��ü��%s���� ���� ��� ������ ã�� �� �����ϴ�."
+msgid "copy of [%s] failed"
+msgstr "[%s] ���� ����."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "��� ���Ͽ���%s���� ���� ����� �����ϴ�."
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "��� ���Ͽ���%s���� ���� ����� �����ϴ�."
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "�������� �ʴ� ��ü��%s���� ���� �õ�"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "selecting multiple media: %s"
+msgstr "�������� �ʴ� ��ü��%s�� ���� �õ�"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "��%s���� ��������� �м��� �� �����ϴ�."
+msgid "trying to select inexistent medium \"%s\""
+msgstr "�������� �ʴ� ��ü��%s�� ���� �õ�"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "��%s���� ��� ������ ����� �� �����ϴ�."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "��ü��%s���� ���� ��� ������ ã�� �� �����ϴ�."
+msgid "retrieving hdlists file..."
+msgstr "[%s] ���� ��"
 
-#: ../urpm.pm_.c:1528
-#, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "��� ���Ͽ���%s���� ���� ����� �����ϴ�."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying hdlists file..."
+msgstr "��� ���� [%s] �д� ��"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access first installation medium"
+msgstr "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
+msgid "added medium %s"
 msgstr "�������� �ʴ� ��ü��%s���� ���� �õ�"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "��� [%s] ���� ��"
+msgid "medium \"%s\" already exists"
+msgstr "��ü��%s���� �̹� �����մϴ�."
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "problem reading hdlist file of medium \"%s\""
 msgstr "��ü��%s���� ���� ��� �ռ� ���� ���� �Ϸ�."
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "ij������ %d ����� ã�ҽ��ϴ�."
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
 
-#: ../urpm.pm_.c:1651
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "ij������ %d ���� ��� ���� ��"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "��%s����ü�� ������Ʈ�� �� �����ϴ�.\n"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "%s ����Ʈ ��"
+msgid "using associated media for parallel mode: %s"
+msgstr ""
 
-#: ../urpm.pm_.c:1811
-#, c-format
-msgid "unmounting %s"
-msgstr "%s ����Ʈ ���� ��"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "��� ���� [%s] �д� ��"
 
-#: ../urpm.pm_.c:1833
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "������Ͽ��� %s �׸� ��ġ ������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "��� ���� [%s] �д� ��"
 
-#: ../urpm.pm_.c:1834
-#, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "������Ͽ��� %s �׸� ��ġ ������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "RPM ���ϡ�%s���� ������ �� �����ϴ�."
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "��ȿ���� ���� RPM ���� �̸� [%s]"
+msgid "write config file [%s]"
+msgstr "���� ���� [%s]�� ���"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr "���� ���� [%s]�� ����� �� �����ϴ�."
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "[%s] ���� ��"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "��%s����ü�� ������ �� �����ϴ�.\n"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "RPM ���ϡ�%s���� ������ �� �����ϴ�."
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "RPM ���ϡ�%s���� ������ �� �����ϴ�."
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "���� ���� ��� ����"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "��%s����ü�� ������ �� �����ϴ�.\n"
 
-#: ../urpm.pm_.c:1960
-#, c-format
-msgid "no package named %s"
-msgstr "%s��� ��Ű���� �����ϴ�."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "���� ��Ű������ %s�� ��� �ֽ��ϴ�: %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
 
-#: ../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\""
-msgstr "������ ���� �̸� ��%s���� ���� ���� ���� ��Ű���� �����մϴ�."
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "��%s���� ���� ��� ������ ã�� �� �����ϴ�. ��ü ���õ�."
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "��ü��%2$s������ RPM ���ϡ�%1$s���� ���� �� �����ϴ�."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "�������� �ʴ� ��ü��%s�� ���� �õ�"
 
-#: ../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)"
-msgstr ""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "��%s���� ��� ���Ͽ� ������ �� �����ϴ�. ��ü ���õ�."
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "��Ű�� %s�� ã�� �� �����ϴ�."
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "�� ������� [%s]�� ��ü�� ������ �� �����ϴ�."
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "��ü [%s]�� ���õ��� �ʾҽ��ϴ�."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"��� ���� [%2$s]�� �������� �ʱ� ������, ��ü��%1$s���� ó���� �� �����ϴ�."
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "��ü��%2$s������ RPM ���ϡ�%1$s���� ���� �� �����ϴ�."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "��ü �̸� ��%s���� ����� �� �����ϴ�. ���� ��� ���Դϴ�."
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"��� ������ �ٸ� ��ü�� ���� �̹� ���ǰ� �ֱ� ������, ��ü ��%s���� ����� "
+"�� �����ϴ�."
 
-#: ../urpm.pm_.c:2337
-#, c-format
-msgid "malformed input: [%s]"
-msgstr "�߸��� ������ �Է�: [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "��ü ��%s���� �̹� ���Ǵ� ����� ����Ϸ� �մϴ�. ��ü ���õ�."
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "[%s] ���� ��"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "��ü ��%s���� �̹� ��� ���� ��������� ����Ϸ� �մϴ�. ��ü ���õ�."
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+#: ../urpm.pm:1
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "���� ������ %s �ٿ� ���� ����"
+
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2457
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "��ġ ����."
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
 msgstr "��ġ ����."
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "��ġ ����."
+msgid "unable to handle protocol: %s"
+msgstr "��� ������ ������ �� �����ϴ�: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../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"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "[%s] ���� ��"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "�������� ������Ű�� ����, ���� ��Ű���鵵 ��ġ�� ���Դϴ�. (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "���� ��Ű���� �� �ϳ��� �ʿ��մϴ�:"
+
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
-
-#: ../urpme_.c:83
-#, fuzzy
 msgid "unknown package"
 msgstr "%s��� ��Ű���� �����ϴ�."
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "%s��� ��Ű���� �����ϴ�."
 
-#: ../urpme_.c:93
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
+
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "���� ��Ű���� �� �ϳ��� �ʿ��մϴ�:"
-
-#: ../urpme_.c:105
-#, fuzzy, c-format
+#: ../urpme:1 ../urpmi:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
-msgstr "�������� ������Ű�� ����, ���� ��Ű���鵵 ��ġ�� ���Դϴ�. (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "[%s] ���� ��"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../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 ""
 
-#: ../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_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr ""
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"����: urpmi.addmedia [--update] <�̸�> <URL>\n"
-"<URL>�� ���� �� �ϳ��Դϴ�.\n"
-"       file://<���>\n"
-"       ftp://<�α��θ�>:<��ȣ>@<ȣ��Ʈ>/<���> with <��Ű�� ��� ������ ���"
-"���>\n"
-"       ftp://<ȣ��Ʈ>/<���> with <��Ű�� ��� ������ �����>\n"
-"       http://<ȣ��Ʈ>/<���> with <��Ű�� ��� ������ �����>\n"
-"       removable_<��ġ>://<���>\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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "��� ���� �̹� ��ġ�Ǿ� �ֽ��ϴ�."
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "��ġ ����."
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "��ġ ����."
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "��ġ�� ���� �����մϱ�? (y/N) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "������ �˻���� ��ġ�մϱ�? (y/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "%s ��ġ ��...\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../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 ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (Y/n) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "���� ��Ű������ %s�� ��� �ֽ��ϴ�: %s"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "�� �Ǿ����� ENTERŰ�� ��������..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "��ġ [%2$s]�� ��%1$s���̵� ��������."
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "�ҽ� ��Ű���� ���� �� �����ϴ�, �ߴ��մϴ�."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "�������� ������Ű�� ����, ���� ��Ű���鵵 ��ġ�� ���Դϴ�. (%d MB)"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"do you agree ?"
 msgstr ""
-"%s\n"
-"<��Ű�� ��� ������ �����>�� ���� �ֽ��ϴ�.\n"
+"���׷��̵��ϱ� ���ؼ��� �Ϻ� ��Ű���� ���ŵǾ�� �մϴ�. �� ����� ���� ����"
+"���� �ʽ��ϴ�.\n"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "��%s����ü�� ������Ʈ�� �� �����ϴ�.\n"
+msgid "unrequested"
+msgstr ""
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "due to conflicts with %s"
 msgstr ""
-"%s\n"
-"<��Ű�� ��� ������ �����>�� ���� �ֽ��ϴ�.\n"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+msgid "due to missing %s"
 msgstr ""
-"%s\n"
-"FTP �̵� ���� ��with���� �����ֽ��ϴ�.\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "��%s����ü�� ������ �� �����ϴ�.\n"
-
-#: ../urpmi.removemedia_.c:34
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"����: urpmi.removemedia [-a] <�̸�> ...\n"
-"<�̸�>�� ������ ��ü��.\n"
-"   -a    ��� ��ü ����.\n"
-"\n"
-"�� �� ���� �ɼ� ��%s��\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"������ ���� �����ϴ�. (�̵� �߰��Ϸ��� ��urpmi.addmedia���� ����ϼ���.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "������ �߸��Ǿ����ϴ�. �ٽ� �õ��ϼ���.\n"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"�����Ϸ��� �׸��� �����ֽ��ϴ�.\n"
-"(%s �� �ϳ�)\n"
+msgid "What is your choice? (1-%d) "
+msgstr "��� ���� �����Ͻðڽ��ϱ�? (1-%d) "
 
-#: ../urpmi.update_.c:60
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"����: urpmi.removemedia [-a] <�̸�> ...\n"
-"<�̸�>�� ������ ��ü��.\n"
-"   -a    ��� ��ü ����.\n"
-"\n"
-"�� �� ���� �ɼ� ��%s��\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "���� ��Ű���� �� �ϳ��� �ʿ��մϴ�:"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "���� ��Ű���� �� �ϳ��� %s�� ��ġ�ϴµ� �ʿ��մϴ�:"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
+
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"������Ʈ�� ���� �����ϴ�. (�̵� �߰��Ϸ��� ��urpmi.addmedia���� ����ϼ�"
-"��.\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"������Ʈ�Ϸ��� �׸��� �����ֽ��ϴ�.\n"
-"(%s �� �ϳ�)\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 "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../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 "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
+#: ../urpmi:1
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "���� ��Ű���� �� �ϳ��� %s�� ��ġ�ϴµ� �ʿ��մϴ�:"
+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_.c:350
-msgid "One of the following packages is needed:"
-msgstr "���� ��Ű���� �� �ϳ��� �ʿ��մϴ�:"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "��%s����ü�� ������Ʈ�� �� �����ϴ�.\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "��� ���� �����Ͻðڽ��ϱ�? (1-%d) "
+msgid "unable to create medium \"%s\"\n"
+msgstr "��%s����ü�� ������ �� �����ϴ�.\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "������ �߸��Ǿ����ϴ�. �ٽ� �õ��ϼ���.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
+msgstr ""
+"%s\n"
+"FTP �̵� ���� ��with���� �����ֽ��ϴ�.\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
 "%s\n"
-"do you agree ?"
+"<relative path of hdlist> missing\n"
 msgstr ""
+"%s\n"
+"<��Ű�� ��� ������ �����>�� ���� �ֽ��ϴ�.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
-
-#: ../urpmi_.c:407
-#, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
+"%s\n"
+"<��Ű�� ��� ������ �����>�� ���� �ֽ��ϴ�.\n"
+
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "[%s] ���� ��"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi_.c:416
-msgid "unrequested"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi_.c:421
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
-"���׷��̵��ϱ� ���ؼ��� �Ϻ� ��Ű���� ���ŵǾ�� �մϴ�. �� ����� ���� ����"
-"���� �ʽ��ϴ�.\n"
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "�������� ������Ű�� ����, ���� ��Ű���鵵 ��ġ�� ���Դϴ�. (%d MB)"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr ""
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "�ҽ� ��Ű���� ���� �� �����ϴ�, �ߴ��մϴ�."
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+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 ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "��ġ [%2$s]�� ��%1$s���̵� ��������."
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "�� �Ǿ����� ENTERŰ�� ��������..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "���� ��Ű������ %s�� ��� �ֽ��ϴ�: %s"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+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 ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (Y/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"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "��ġ ����."
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "%s ��ġ ��...\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "������ �˻���� ��ġ�մϱ�? (y/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "��ġ�� ���� �����մϱ�? (y/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "��� ���� �̹� ��ġ�Ǿ� �ֽ��ϴ�."
-
-#: ../urpmq_.c:35
-#, 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"
-msgstr ""
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+"and [options] are from\n"
 msgstr ""
+"����: urpmi.addmedia [--update] <�̸�> <URL>\n"
+"<URL>�� ���� �� �ϳ��Դϴ�.\n"
+"       file://<���>\n"
+"       ftp://<�α��θ�>:<��ȣ>@<ȣ��Ʈ>/<���> with <��Ű�� ��� ������ ���"
+"���>\n"
+"       ftp://<ȣ��Ʈ>/<���> with <��Ű�� ��� ������ �����>\n"
+"       http://<ȣ��Ʈ>/<���> with <��Ű�� ��� ������ �����>\n"
+"       removable_<��ġ>://<���>\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"�����Ϸ��� �׸��� �����ֽ��ϴ�.\n"
+"(%s �� �ϳ�)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"������ ���� �����ϴ�. (�̵� �߰��Ϸ��� ��urpmi.addmedia���� ����ϼ���.\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, fuzzy, 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 ""
+"����: urpmi.removemedia [-a] <�̸�> ...\n"
+"<�̸�>�� ������ ��ü��.\n"
+"   -a    ��� ��ü ����.\n"
+"\n"
+"�� �� ���� �ɼ� ��%s��\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 ""
+"������Ʈ�Ϸ��� �׸��� �����ֽ��ϴ�.\n"
+"(%s �� �ϳ�)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"������Ʈ�� ���� �����ϴ�. (�̵� �߰��Ϸ��� ��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 ""
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr ""
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"����: urpmi.removemedia [-a] <�̸�> ...\n"
+"<�̸�>�� ������ ��ü��.\n"
+"   -a    ��� ��ü ����.\n"
+"\n"
+"�� �� ���� �ɼ� ��%s��\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf ���� %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM ���� ��%s���� ���� �� �����ϴ�.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr ""
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "����: urpmf [�ɼǵ�] <����>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "��ġ ����."
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "�� ���� �ɼ��� ������ urpmf --help��� ġ����."
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "��ġ ����."
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "���� ������ %s �ٿ� ���� ����"
-
-#, fuzzy
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "��ü ��%s���� �̹� ��� ���� ��������� ����Ϸ� �մϴ�. ��ü ���õ�."
-
 #~ msgid "nothing to write in list file for \"%s\""
 #~ msgstr "��%s���� ���� ��� ���Ͽ� ����� ���� �����ϴ�."
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr ""
-#~ "urpmq: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: RPM ���� ��%s���� ���� �� �����ϴ�.\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi�� ��ġ�Ǿ� ���� �ʽ��ϴ�."
 
diff --git a/po/lt.po b/po/lt.po
index ae062e5e..bd5e017d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,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: 2001-03-04 15:40+0200\n"
 "Last-Translator: Mykolas Norvai�as <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -14,1464 +14,1632 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "�diegiamas %s\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 "TtYy"
 
-#: ../_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 "Nn"
+
+#: placeholder.h:18
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "urpmf version %s"
+msgstr "urpmf versija %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
 msgstr ""
-"Automatinis paket� �diegimas...\n"
-"J�s� u�klaust� paket� �diegimas %s\n"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Ar taip gerai?"
+#: placeholder.h:20
+msgid ""
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
+msgstr ""
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Gerai"
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "naudojimas: urpmf [<byla>]"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Nutraukti"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
 
-#: ../_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 "Nn"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
 
-#: ../_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 "TtYy"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr ""
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (T/n) "
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
 
-#: ../_irpm_.c:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: komanda nerasta\n"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
 
-#: ../urpm.pm_.c:178
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: ../urpm.pm_.c:197
-#, c-format
-msgid "unknown protocol defined for %s"
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: ../urpm.pm_.c:226
-#, c-format
-msgid "unable to handle protocol: %s"
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "�diegimas nepavyko"
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr ""
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:288
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:556
-#, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:572
-#, c-format
+#: placeholder.h:36
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:578
-#, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: ../urpm.pm_.c:585
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr ""
+
+#: placeholder.h:40
+msgid "no full media list was found"
 msgstr ""
 
-#: ../urpm.pm_.c:589
+#: ../_irpm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "%s: command not found\n"
+msgstr "%s: komanda nerasta\n"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid " (Y/n) "
+msgstr " (T/n) "
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Cancel"
+msgstr "Nutraukti"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Gerai"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Ar taip gerai?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Automatinis paket� �diegimas...\n"
+"J�s� u�klaust� paket� �diegimas %s\n"
 
-#: ../urpm.pm_.c:598
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid "installing %s\n"
+msgstr "�diegiamas %s\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "%s is needed by %s"
 msgstr ""
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "unable to install package %s"
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "unable to remove package %s"
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "urpmi database locked"
+msgstr "rpm duomen� baz�s patikrinimas nepavyko\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
-
-#: ../urpm.pm_.c:735
-#, fuzzy, c-format
-msgid "write config file [%s]"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %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:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr ""
+#: ../urpm.pm:1 ../urpme:1
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "�iuose paketuose yra %s: %s\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "n�ra paketo su tokiu pavadinimu %s\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 "error registering local packages"
 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 "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
+msgid "retrieving rpm file [%s] ..."
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:837 ../urpm.pm_.c:1108 ../urpm.pm_.c:1218 ../urpm.pm_.c:1395
-#: ../urpm.pm_.c:1546
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "invalid rpm file name [%s]"
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unmounting %s"
+msgstr "�diegiamas %s\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "�diegiamas %s\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../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 "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "�diegimas nepavyko"
+#: ../urpm.pm:1
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr ""
 
-#: ../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 "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../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 "performing second pass to compute dependencies\n"
 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"
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: ../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\""
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "no hdlist file found for medium \"%s\""
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-#, fuzzy
-msgid "urpmi database locked"
-msgstr "rpm duomen� baz�s patikrinimas nepavyko\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
+msgid "retrieving description file of \"%s\"..."
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy of [%s] failed"
-msgstr "�diegimas nepavyko"
+msgid "reading rpm files from [%s]"
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
+#: ../urpm.pm:1
+#, c-format
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "�diegimas nepavyko"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+msgid "copy of [%s] failed"
+msgstr "�diegimas nepavyko"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid "removing medium \"%s\""
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1300
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+#: ../urpm.pm:1
+#, c-format
+msgid "selecting multiple media: %s"
+msgstr ""
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm_.c:1480
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr ""
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
+msgid "retrieving hdlists file..."
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1526
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying hdlists file..."
+msgstr ""
 
-#: ../urpm.pm_.c:1528
-#, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access first installation medium"
+msgstr ""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" already exists"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "unable to use parallel option \"%s\""
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1798
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "�diegiamas %s\n"
-
-#: ../urpm.pm_.c:1811
-#, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "�diegiamas %s\n"
-
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
+msgid "write config file [%s]"
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "unable to write config file [%s]"
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1865
-msgid "unable to register rpm file"
+#: ../urpm.pm:1
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1960
-#, fuzzy, c-format
-msgid "no package named %s"
-msgstr "n�ra paketo su tokiu pavadinimu %s\n"
-
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "�iuose paketuose yra %s: %s\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%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 "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../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 "unable to find hdlist 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 "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
+msgid "unable to access list file of \"%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 "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2249
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+#: ../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:2417
-msgid "Preparing..."
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to install package %s"
+msgid "syntax error in config file at line %s"
 msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
+msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "�diegimas nepavyko"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "�diegimas nepavyko"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr ""
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
+msgid "copy failed: %s"
 msgstr "�diegimas nepavyko"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../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"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Priklausomybi� patenkinimui, bus �diegti �ie paketai(%d Mb)"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Vienas i� �i� paket� yra reikalingas."
+
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme_.c:64
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#: ../urpme:1
+#, c-format
+msgid "removing package %s will break your system"
 msgstr ""
-"urpmi: ne�inomas nustatymas \"-%s\", patikrinkite naudojim� su --help\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "n�ra paketo su tokiu pavadinimu %s\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "n�ra paketo su tokiu pavadinimu %s\n"
 
-#: ../urpme_.c:93
-#, c-format
-msgid "removing package %s will break your system"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
+"urpmi: ne�inomas nustatymas \"-%s\", patikrinkite naudojim� su --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Vienas i� �i� paket� yra reikalingas."
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
 
-#: ../urpme_.c:105
-#, fuzzy, c-format
+#: ../urpme:1 ../urpmi:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
-msgstr "Priklausomybi� patenkinimui, bus �diegti �ie paketai(%d Mb)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
 
-#: ../urpme_.c:113
-msgid "Removing failed"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../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 ""
 
-#: ../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_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr ""
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"naudojimas: urpmi.addmedia [--update] <name> <url>\n"
-"kur <url> yra vienas i�\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <reliatyviu bylos "
-"hdlistvardu>\n"
-"       ftp://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
-"       http://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
-"       removable_<device>://<path>\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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "viskas ir taip jau �diegta"
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "�diegimas nepavyko"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "�diegimas nepavyko"
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pabandyti �diegim� priverstinai (--force)? (t/N) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pabandyti �diegim� be priklausomybi� tikrinimo? (t/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "�diegiamas %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../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 ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (T/n) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "�iuose paketuose yra %s: %s\n"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Pra�ome spausti 'enter', kada bus baigta..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Pra�ome �ki�ti laikmen� pavadint� \"%s\", � �rengin� [%s]"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "negaliu gauti pirmini� byl�, nutraukiu"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "Priklausomybi� patenkinimui, bus �diegti �ie paketai(%d Mb)"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"do you agree ?"
 msgstr ""
-"%s\n"
-"<relatyviu keliu iki hdlist> tr�ksta\n"
+"kaikuriuos paketus reikia i�mesti prie� atnaujinant, tai dar nepalaikoma \n"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "due to conflicts with %s"
 msgstr ""
-"%s\n"
-"<relatyviu keliu iki hdlist> tr�ksta\n"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+msgid "due to missing %s"
 msgstr ""
-"%s\n"
-"`with' t�kstama ftp laikmena\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-#, fuzzy
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr "naudojimas: urpmi.addmedia <vardas> <url>"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
-#, fuzzy, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr "ne�inomi nustatymai \"%s\"\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atsipra�au, blogas pasirinkimas, pakartokit\n"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "n�ra k� atnaujinti (prid�ti laikmenai naudokite urpmi.addmedia)\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Koks J�s� pasirinkimas? (1-%d)"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"t�ksta �ra�o i�metimui\n"
-"(vienas i� %s)\n"
+msgid "One of the following packages is needed:"
+msgstr "Vienas i� �i� paket� yra reikalingas."
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Vienas i� �i� paket� yra reikalingas."
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
+
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "n�ra k� atnaujinti (prid�ti laikmenai naudokite urpmi.addmedia)\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
+"urpmi: ne�inomas nustatymas \"-%s\", patikrinkite naudojim� su --help\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"tr�ksta �ra�o atnaujinimui\n"
-"(vienas i� %s)\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 "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../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 "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr ""
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\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 ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"urpmi: ne�inomas nustatymas \"-%s\", patikrinkite naudojim� su --help\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
-
-#: ../urpmi_.c:349
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Vienas i� �i� paket� yra reikalingas."
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Vienas i� �i� paket� yra reikalingas."
-
-#: ../urpmi_.c:358
+#: ../urpmi:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Koks J�s� pasirinkimas? (1-%d)"
-
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atsipra�au, blogas pasirinkimas, pakartokit\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"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_.c:402
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "Tik root vartotojas gali �diegti vietinius paketus"
-
-#: ../urpmi_.c:407
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
+"%s\n"
+"`with' t�kstama ftp laikmena\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
+"%s\n"
+"<relatyviu keliu iki hdlist> tr�ksta\n"
 
-#: ../urpmi_.c:421
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"do you agree ?"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"kaikuriuos paketus reikia i�mesti prie� atnaujinant, tai dar nepalaikoma \n"
+"%s\n"
+"<relatyviu keliu iki hdlist> tr�ksta\n"
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
-#, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "Priklausomybi� patenkinimui, bus �diegti �ie paketai(%d Mb)"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "Tik root vartotojas gali �diegti vietinius paketus"
 
-#: ../urpmi_.c:463
+#: ../urpmi.addmedia:1
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "negaliu gauti pirmini� byl�, nutraukiu"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr "ne�inomi nustatymai \"%s\"\n"
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../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 "Pra�ome �ki�ti laikmen� pavadint� \"%s\", � �rengin� [%s]"
-
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Pra�ome spausti 'enter', kada bus baigta..."
-
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "�iuose paketuose yra %s: %s\n"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi_.c:540
-#, fuzzy
-msgid " (y/N) "
-msgstr " (T/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 ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "�diegimas nepavyko"
-
-#: ../urpmi_.c:572
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "�diegiamas %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pabandyti �diegim� be priklausomybi� tikrinimo? (t/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pabandyti �diegim� priverstinai (--force)? (t/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "viskas ir taip jau �diegta"
-
-#: ../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"
-"\n"
-"usage:\n"
+"  --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 ""
 
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../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 ""
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmq_.c:51
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\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"
+"and [options] are from\n"
 msgstr ""
+"naudojimas: urpmi.addmedia [--update] <name> <url>\n"
+"kur <url> yra vienas i�\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <reliatyviu bylos "
+"hdlistvardu>\n"
+"       ftp://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
+"       http://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
+"       removable_<device>://<path>\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.removemedia:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"t�ksta �ra�o i�metimui\n"
+"(vienas i� %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "n�ra k� atnaujinti (prid�ti laikmenai naudokite urpmi.addmedia)\n"
+
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq_.c:64
+#: ../urpmi.removemedia:1
+#, fuzzy, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr "naudojimas: urpmi.addmedia <vardas> <url>"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"tr�ksta �ra�o atnaujinimui\n"
+"(vienas i� %s)\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "n�ra k� atnaujinti (prid�ti laikmenai naudokite urpmi.addmedia)\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versija %s"
-
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr ""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: negai perskaityti rpm bylos \"%s\"\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
+"urpmq: ne�inomas nustatymas \"-%s\", patikrinkite naudojim� su --help\n"
 
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "naudojimas: urpmf [<byla>]"
-
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: placeholder.h:25
-msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (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 ""
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr ""
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "�diegimas nepavyko"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr ""
-#~ "urpmq: ne�inomas nustatymas \"-%s\", patikrinkite naudojim� su --help\n"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "�diegimas nepavyko"
 
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: negai perskaityti rpm bylos \"%s\"\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr ""
 
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi ne�diegtas"
diff --git a/po/lv.po b/po/lv.po
index a75c89f9..cf69f5c2 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,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: 2002-09-27 17:43+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -15,1565 +15,1693 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "tiek instal�ta %s\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 "Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versja %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Autorties�bas (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 ""
-"Autom�tik� pakot�u uzst�d��ana...\n"
-"J�s l�dz�t uzst�d�t pakotni %s\n"
+"�� ir br�v� programmat�ra, un dr�kst tikt izplat�ta saska�� ar GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Vai piekr�tat?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "pielietojums: urpmf [opcijas] <fails>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Labi"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - nedruk�t iez�mes v�rdu (noklus�tais, ja iez�me nav dota"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Atcelt"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    komandrind�, nesavienojams ar interakt�vo re��mu)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - druk�t visas iez�mes."
 
-#: ../_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          - druk�t iez�mes v�rdu: rpm fila v�rds (pie�em, ja iez�me "
+"nav"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    dota komandrind�; bez pakotnes v�rda)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - druk�t iez�mi: grupa."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - druk�t iez�mi: izm�rs."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - druk�t iez�mi: seri�lais numurs."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - druk�t iez�mi: kopsavilkums."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - druk�t iez�mui: apraksts."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - druk�t iez�mi: nodro�ina (vair�kas rindi�as)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - druk�t iez�mi: nepiecie�amas (vair�kas rindi�as)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - druk�t iez�mi: faili (vair�kas rindi�as)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr "  --conflicts     - druk�t iez�mi: konflikti (vair�kas rindi�as)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr "  --obsoletes     - druk�t iez�mi: novecoju�as (vair�kas rindi�as)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - druk�t iez�mi: prereqs (vair�kas rindi�as)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "m��iniet urpmf --help priek� palpildus pal�dz�bas"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr ""
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: komanda nav atrata\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "Nezin�ms protokols defin�ts priek� %s"
+msgid "Cancel"
+msgstr "Atcelt"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Labi"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Vai piekr�tat?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Autom�tik� pakot�u uzst�d��ana...\n"
+"J�s l�dz�t uzst�d�t pakotni %s\n"
 
-#: ../urpm.pm_.c:226
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nav iesp�jams izmantot protokolu: %s"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "tiek instal�ta %s\n"
 
-#: ../urpm.pm_.c:246
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...kop��ana neizdev�s"
+msgid "unable to open rpmdb"
+msgstr "nav iesp�jams re�istr�t rpm failu"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget nav atrodams\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "nav iesp�jams piek��t rpm failam [%s]"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget neizdev�s: beidz�s ar %d vai sign�lu %d\n"
+msgid "%s conflicts with %s"
+msgstr "%s konflik� ar %s"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl nav atrodams\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr "%s ir nepiecie�ams %s"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"Datu nes�js \"%s\" m��ina lietot jau pielietotu sarakstu, datu nes�js tiek "
-"ignor�ts"
+msgid "unable to install package %s"
+msgstr "nevaru instal�t pakotni %s"
 
-#: ../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 ""
-"nevaru par�p�ties par datu nes�ju \"%s\", jo saraksta failu lieto jau cits "
-"datu nes�js"
+msgid "unable to remove package %s"
+msgstr "nevaru no�emt pakotni %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nevar izmantor v�rdu \"%s\" priek� bezv�rda datu nes�ja, jo v�rds ir jau "
-"izmantots"
+msgid "Preparing..."
+msgstr "Sagatavoju..."
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...atg��ana neizdev�s: %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, c-format
+msgid "...retrieving done"
+msgstr "...atg��ana veikta"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "nevar noteikt datu nes�ju no hdlist faila [%s]"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "atg�stu rpm failus..."
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nevar noteikt datu nes�ju no hdlist faila [%s]"
+msgid "malformed input: [%s]"
+msgstr "nepareizi izveidots ievads: [%s]"
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "nevar piek��t \"%s\" hdlist failam, datu nes�js tiek ignor�ts"
+msgid "unable to access medium \"%s\""
+msgstr "nav iesp�jams piek��t datu nes�jam \"%s\""
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nevar piek��t \"%s\" saraksta failam, datu nes�js tiek ignor�ts"
+msgid "urpmi database locked"
+msgstr "urpmi datub�ze nosl�gta"
 
-#: ../urpm.pm_.c:614
-#, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "m��in�ts izv�l�ties neeksist�jo�u datu nes�ju \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "nevaru atrast \"%s\" hdlist failu, datu nes�js tiek ignor�ts"
+msgid "medium \"%s\" is not selected"
+msgstr "datu nes�js \"%s\" nav izv�l�ts"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-"nevar atrasta saraksta failu priek� \"%s\", datu nes�js neiks �emts v�r�"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nav iesp�jams nolas�t rpm failu [%s] no datu nes�ja \"%s\""
 
-#: ../urpm.pm_.c:651
-#, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
-"nevar atrasta saraksta failu priek� \"%s\", datu nes�js neiks �emts v�r�"
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
+msgstr "pakotne %s nav atrasta."
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nevaru inspic�t \"%s\" saraksta failu, datu nes�js tiek ignor�ts"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "p�r�k daudz mont��anas punktu no�emamajam datu nes�jam \"%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:691
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "�emu no�emamo ier�ci, k� \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ir vair�kas pakotnes ar vien�du rpm faila v�rdu \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "lietoju citu no�emamo ier�ci [%s] priek� \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nav iesp�jams nolas�t rpm failu [%s] no datu nes�ja \"%s\""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "p�r�k daudz mont��anas punktu no�emamajam datu nes�jam \"%s\""
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Sekojo�as pakotnes satur %s: %s"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nevar saglab�t konfigur�cijas failu [%s]"
+msgid "no package named %s"
+msgstr "nav pakotnes ar nosaukumu %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "rakstu konfigur�cijas failu [%s]"
+msgid "error registering local packages"
+msgstr "k��da re�istr�jot lok�l�s pakotnes"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to register rpm file"
 msgstr "nav iesp�jams piek��t rpm failam [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "eksamin�ju hdlist failu [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "atg�stu rpm failus..."
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "neder�gs rpm faila v�rds [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "nav iesp�jams lietot paral�lo opciju \"%s\""
+msgid "unmounting %s"
+msgstr "atmont�ju %s"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "mont�ju %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "iz�emu %d novecoju�us ies�kumus no ke�atmi�as"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "atradu %d ies�kumus ke�atmi��"
 
-#: ../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 "built hdlist synthesis file for medium \"%s\""
+msgstr "uzb�v�ju hdlist synthesis failu priek� datu nes�ja \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "eksamin�ju hdlist failu [%s]"
 
-#: ../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]"
 msgstr "eksamin�ju synthesis failu [%s]"
 
-#: ../urpm.pm_.c:825
-#, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "probl�ma nolasot datu nes�ja \"%s\" hdlist failu"
-
-#: ../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\""
-msgstr "probl�ma nolasot datu nes�ja \"%s\" synthesis failu"
+msgid "building hdlist [%s]"
+msgstr "b�v�ju hdlist [%s]"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "nav iesp�jams re�istr�t rpm failu"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "ielasu s�kumus no datu nes�ja \"%s\""
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "datu nes�js \"%s\" jau eksist�"
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "pievienoju datu nes�ju %s."
-
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "nav iesp�jams piek��t pirmajam instal�cijas datu nes�jam"
-
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "kop�ju hdlists failu..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "probl�ma nolasot datu nes�ja \"%s\" synthesis failu"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kop��ana veikta"
+#: ../urpm.pm:1
+#, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr "saraksta fails priek� \"%s\" ir tuk�s"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kop��ana veikta"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "netika atrasts hdlist fails priek� datu nes�ja \"%s\""
 
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
-#, fuzzy
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "nav iesp�jams piek��t pirmajam instal�cijas datu nes�jam"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "nevaru ierakst�t \"%s\" saraksta failu"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "atg�stu hdlists failu..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fails [%s] jau tiek lietots tai pa�� datu nes�j� \"%s\""
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...atg��ana veikta"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nevaru izanaliz�t \"%s\" hdlist failu"
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...atg��ana neizdev�s: %s"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "netika atrasts hdlist fails priek� datu nes�ja \"%s\""
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "neder�gs hdlist apraksts \"%s\" hdlists fail�"
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr ""
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "m��in�ts izv�l�ties neeksist�jo�u datu nes�ju \"%s\""
+msgid "examining MD5SUM file"
+msgstr "eksamin�ju hdlist failu [%s]"
 
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "saraksta fails priek� \"%s\" ir tuk�s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "izv�los vair�kas vides: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "atg�stu \"%s\" apraksta failu..."
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "no�emu datu nes�ju \"%s\""
+msgid "retrieving description file of \"%s\"..."
+msgstr "atg�stu \"%s\" apraksta failu..."
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-#, fuzzy
-msgid "urpmi database locked"
-msgstr "urpmi datub�ze nosl�gta"
+#: ../urpm.pm:1
+#, c-format
+msgid "no rpm files found from [%s]"
+msgstr "netika atrasti rpm faili no [%s]"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nav iesp�jams piek��t datu nes�jam \"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "neizdev�s nolas�t rpm failus no [%s]: %s"
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kop�ju \"%s\" apraksta failu ..."
+msgid "reading rpm files from [%s]"
+msgstr "nolasu rpm failus no [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "...copying done"
+msgstr "...kop��ana veikta"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "...copying failed"
+msgstr "...kop��ana veikta"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
 msgstr "saraksta fails priek� \"%s\" ir tuk�s"
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "[%s] kop��ana neizdev�s"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "eksamin�ju hdlist failu [%s]"
-
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "saraksta fails priek� \"%s\" ir tuk�s"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "nolasu rpm failus no [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "kop�ju \"%s\" apraksta failu ..."
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "neizdev�s nolas�t rpm failus no [%s]: %s"
+msgid "removing medium \"%s\""
+msgstr "no�emu datu nes�ju \"%s\""
 
-#: ../urpm.pm_.c:1272
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "netika atrasti rpm faili no [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "selecting multiple media: %s"
+msgstr "izv�los vair�kas vides: %s"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "atg�stu \"%s\" apraksta failu..."
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "atg�stu \"%s\" apraksta failu..."
+msgid "trying to select inexistent medium \"%s\""
+msgstr "m��in�ts izv�l�ties neeksist�jo�u datu nes�ju \"%s\""
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "nav iesp�jams piek��t pirmajam instal�cijas datu nes�jam"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "netika atrasts hdlist fails priek� datu nes�ja \"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "neder�gs hdlist apraksts \"%s\" hdlists fail�"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fails [%s] jau tiek lietots tai pa�� datu nes�j� \"%s\""
+msgid "retrieving hdlists file..."
+msgstr "atg�stu hdlists failu..."
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "nevaru izanaliz�t \"%s\" hdlist failu"
+msgid "copying hdlists file..."
+msgstr "kop�ju hdlists failu..."
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "nevaru ierakst�t \"%s\" saraksta failu"
-
-#: ../urpm.pm_.c:1526
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "netika atrasts hdlist fails priek� datu nes�ja \"%s\""
+msgid "unable to access first installation medium"
+msgstr "nav iesp�jams piek��t pirmajam instal�cijas datu nes�jam"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "saraksta fails priek� \"%s\" ir tuk�s"
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr ""
+msgid "added medium %s"
+msgstr "pievienoju datu nes�ju %s."
 
-#: ../urpm.pm_.c:1592
-#, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "ielasu s�kumus no datu nes�ja \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" already exists"
+msgstr "datu nes�js \"%s\" jau eksist�"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "b�v�ju hdlist [%s]"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "probl�ma nolasot datu nes�ja \"%s\" hdlist failu"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "uzb�v�ju hdlist synthesis failu priek� datu nes�ja \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "atradu %d ies�kumus ke�atmi��"
+msgid "unable to use parallel option \"%s\""
+msgstr "nav iesp�jams lietot paral�lo opciju \"%s\""
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "iz�emu %d novecoju�us ies�kumus no ke�atmi�as"
+msgid "using associated media for parallel mode: %s"
+msgstr ""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "mont�ju %s"
+msgid "found parallel handler for nodes: %s"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "eksamin�ju hdlist failu [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "nav iesp�jams piek��t rpm failam [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "atmont�ju %s"
+msgid "write config file [%s]"
+msgstr "rakstu konfigur�cijas failu [%s]"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+msgid "unable to write config file [%s]"
+msgstr "nevar saglab�t konfigur�cijas failu [%s]"
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "p�r�k daudz mont��anas punktu no�emamajam datu nes�jam \"%s\""
 
-#: ../urpm.pm_.c:1847
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "neder�gs rpm faila v�rds [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "lietoju citu no�emamo ier�ci [%s] priek� \"%s\""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "atg�stu rpm failus..."
+msgid "taking removable device as \"%s\""
+msgstr "�emu no�emamo ier�ci, k� \"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "nav iesp�jams piek��t rpm failam [%s]"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "p�r�k daudz mont��anas punktu no�emamajam datu nes�jam \"%s\""
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "nav iesp�jams piek��t rpm failam [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nevaru inspic�t \"%s\" saraksta failu, datu nes�js tiek ignor�ts"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "k��da re�istr�jot lok�l�s pakotnes"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+"nevar atrasta saraksta failu priek� \"%s\", datu nes�js neiks �emts v�r�"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "nav pakotnes ar nosaukumu %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+"nevar atrasta saraksta failu priek� \"%s\", datu nes�js neiks �emts v�r�"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Sekojo�as pakotnes satur %s: %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "nevaru atrast \"%s\" hdlist failu, datu nes�js tiek ignor�ts"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "m��in�ts izv�l�ties neeksist�jo�u datu nes�ju \"%s\""
 
-#: ../urpm.pm_.c:2105 ../urpm.pm_.c:2137 ../urpm.pm_.c:2159
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "nevar piek��t \"%s\" saraksta failam, datu nes�js tiek ignor�ts"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "ir vair�kas pakotnes ar vien�du rpm faila v�rdu \"%s\""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "nevar piek��t \"%s\" hdlist failam, datu nes�js tiek ignor�ts"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nevar noteikt datu nes�ju no hdlist faila [%s]"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nav iesp�jams nolas�t rpm failu [%s] no datu nes�ja \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "nevar noteikt datu nes�ju no hdlist faila [%s]"
 
-#: ../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 "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
+"nevar izmantor v�rdu \"%s\" priek� bezv�rda datu nes�ja, jo v�rds ir jau "
+"izmantots"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"nevaru par�p�ties par datu nes�ju \"%s\", jo saraksta failu lieto jau cits "
+"datu nes�js"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "pakotne %s nav atrasta."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"Datu nes�js \"%s\" m��ina lietot jau pielietotu sarakstu, datu nes�js tiek "
+"ignor�ts"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "datu nes�js \"%s\" nav izv�l�ts"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"Datu nes�js \"%s\" m��ina lietot jau pielietotu hdlist, datu nes�js tiek "
+"ignor�ts"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nav iesp�jams nolas�t rpm failu [%s] no datu nes�ja \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "sintakses k��da konfigur�cijas fail�, rind� %s"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "nepareizi izveidots ievads: [%s]"
-
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "atg�stu rpm failus..."
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Sagatavoju..."
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "nevaru no�emt pakotni %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync neizdev�s: beidz�s ar %d vai sign�lu %d\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "nevaru instal�t pakotni %s"
+msgid "ssh is missing\n"
+msgstr "ssh nav atrodams\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s ir nepiecie�ams %s"
+msgid "rsync is missing\n"
+msgstr "rsync nav atrodams\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s konflik� ar %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl neizdev�s: beidz�s ar %d vai sign�lu %d\n"
 
-#: ../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 ""
-
-#: ../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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl nav atrodams\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget neizdev�s: beidz�s ar %d vai sign�lu %d\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 "Instal��ana neizdev�s mezgl� %s"
+msgid "wget is missing\n"
+msgstr "wget nav atrodams\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 "Instal��ana ir iesp�jama"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "...kop��ana neizdev�s"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Instal��ana neizdev�s mezgl� %s"
+msgid "unable to handle protocol: %s"
+msgstr "nav iesp�jams izmantot protokolu: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "hostam %s nav labas urpmi versijas"
-
-#: ../urpme_.c:39
-#, fuzzy, 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"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
-"urpmi versija %s\n"
-"Autorties�bas (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"�� ir br�va programmat�ra, un var tikt izplat�ta saska�� ar GNU GPL.\n"
-"\n"
-"pielietojums:\n"
 
-#: ../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         - izvad�t �o pal�dz�bas zi�ojumu.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "Nezin�ms protokols defin�ts priek� %s"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "...kop��ana neizdev�s"
+
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - p�rbaud�t, vai instal�cija var tikt veikta korekti.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Lai apmierin�tu atkar�bas, tiks no�emtas sekojo�as pakotnes (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Nav nek�, ko no�emt.\n"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nezin�ma opcija \"-%s\", p�rbaudiet pielietojumu ar --help\n"
+msgid "removing package %s will break your system"
+msgstr "pakotnes %s no�em�ana saboj�s J�su sist�mu\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "nezin�ma pakotne"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "nezin�mas pakotnes"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "pakotnes %s no�em�ana saboj�s J�su sist�mu\n"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nezin�ma opcija \"-%s\", p�rbaudiet pielietojumu ar --help\n"
 
-#: ../urpme_.c:95
-#, fuzzy
-msgid "Nothing to remove"
-msgstr "Nav nek�, ko no�emt.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
-msgstr "Lai apmierin�tu atkar�bas, tiks no�emtas sekojo�as pakotnes (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - p�rbaud�t, vai instal�cija var tikt veikta korekti.\n"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "...kop��ana neizdev�s"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
 
-#: ../urpmf_.c:26
+#: ../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         - izvad�t �o pal�dz�bas zi�ojumu.\n"
+
+#: ../urpme:1
 #, fuzzy, 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 ""
-"urpmq versija %s\n"
-"Autorties�bas (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"�� ir br�va programmat�ra, un var tikt izplat�ta saska�� ar GNU GPL "
-"noteikumiem.\n"
+"urpmi versija %s\n"
+"Autorties�bas (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"�� ir br�va programmat�ra, un var tikt izplat�ta saska�� ar GNU GPL.\n"
 "\n"
 "pielietojums:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --update       - izveidot atjaunin��anas datu nes�ju.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
 
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - run�gais re��ms.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  -f             - fors�t hdlist failu �ener��anu.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - nedruk�t iez�mes v�rdu (noklus�tais, ja iez�me nav dota"
-
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - druk�t visas iez�mes."
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - druk�t iez�mes v�rdu: rpm fila v�rds (pie�em, ja iez�me "
-"nav"
 
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - druk�t iez�mi: grupa."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
 
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - druk�t iez�mi: izm�rs."
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
 
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - druk�t iez�mi: izm�rs."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - fors�t hdlist failu �ener��anu.\n"
 
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - druk�t iez�mi: kopsavilkums."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr "  --obsoletes     - druk�t iez�mi: novecoju�as (vair�kas rindi�as)."
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - druk�t iez�mui: apraksts."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr "  --conflicts     - druk�t iez�mi: konflikti (vair�kas rindi�as)."
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr "  --provides      - druk�t iez�mi: nodro�ina (vair�kas rindi�as)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - druk�t iez�mi: faili (vair�kas rindi�as)."
 
-#: ../urpmf_.c:47
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr "  --requires      - druk�t iez�mi: nepiecie�amas (vair�kas rindi�as)."
 
-#: ../urpmf_.c:48
-#, fuzzy
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - druk�t iez�mi: faili (vair�kas rindi�as)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+msgstr "  --provides      - druk�t iez�mi: nodro�ina (vair�kas rindi�as)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr "  --conflicts     - druk�t iez�mi: konflikti (vair�kas rindi�as)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - druk�t iez�mui: apraksts."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr "  --obsoletes     - druk�t iez�mi: novecoju�as (vair�kas rindi�as)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - druk�t iez�mi: kopsavilkums."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - fors�t hdlist failu �ener��anu.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - druk�t iez�mi: izm�rs."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - druk�t iez�mi: izm�rs."
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - druk�t iez�mi: grupa."
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
+"  --name          - druk�t iez�mes v�rdu: rpm fila v�rds (pie�em, ja iez�me "
+"nav"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - druk�t visas iez�mes."
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - nedruk�t iez�mes v�rdu (noklus�tais, ja iez�me nav dota"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  -f             - fors�t hdlist failu �ener��anu.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - run�gais re��ms.\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --update       - izveidot atjaunin��anas datu nes�ju.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"Pielietojums: urpmi.addmedia [opcijas] <v�rds> <url> [with "
-"<relat�vais_ce��>]\n"
-"kur <url> ir viens no\n"
-"       file://<ce��>\n"
-"       ftp://<lietot�ja_v�rds>:<parole>@<hosts>/<ce��> with <hdlist "
-"relat�vais faila v�rds>\n"
-"       ftp://<host>/<ce��> with <hdlist relat�vais faila v�rds>\n"
-"       http://<host>/<ce��> with <hdlist relat�vais faila v�rds>\n"
-"       removable://<ce��>\n"
+"urpmq versija %s\n"
+"Autorties�bas (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"�� ir br�va programmat�ra, un var tikt izplat�ta saska�� ar GNU GPL "
+"noteikumiem.\n"
 "\n"
-"un [opcijas] ir no\n"
+"pielietojums:\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         - lietot wget, lai ieg�tu att�lin�tos failus.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "viss jau ir instal�ts"
 
-#: ../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         - lietot curl, lai ieg�tu att�lin�tos failus.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Instal��ana ir iesp�jama"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instal��ana neizdev�s"
 
-#: ../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        - lietot nor�d�to HTTP proxy, porta numurs tiek pie�emts,\n"
-"                   ka ir 1080 p�c noklus��anas (form�ts ir <proxy_hosts[:"
-"ports]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Vai m��in�t instal�t v�l uzst�j�g�k (--force)? (j/N) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - nor�d�t lietot�ja v�rdu un paroli lieto�anai\n"
-"                   priek� proxy autentifik�cijas (form�ts ir <lietot�js:"
-"parole>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Vai m��in�t instal�t bez atkar�bu p�rbaudes? (j/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - izveidot atjaunin��anas datu nes�ju.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "izplatu %s\n"
 
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --distrib      - autom�tiski veidot visas vides no instal�cijas datu "
-"nes�ja.\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 ""
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
+msgid "Do you want to continue installation ?"
+msgstr "V�laties turpin�t instal��anu?"
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Sekojo��m pakotn�m ir slikti paraksti"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Nospiediet Enter, kad gatavs..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-#, fuzzy
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "L�dzu ielieciet datu nes�ju \"%s\" ier�c� [%s]"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - m��in�t atrast un lietot synthesis vai hdlist failu.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "nevar dab�t koda pakotnes, p�rtraucu"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - fors�t hdlist failu �ener��anu.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "Lai apmierin�tu atkar�bas, tiks instal�tas sekojo�as pakotnes (%d MB)"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
+"Jums j�b�t root, lai instal�tu sekojo�as atkar�bas:\n"
+"%s\n"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"do you agree ?"
 msgstr ""
+"Sekojo�as pakotnes ir j�no�em, lai uzlabotu citas:\n"
 "%s\n"
-"nav nepiecie�ams uzr�d�t <hdlist relat�vo ce�u> ar --distrib"
+"vai piekr�tat?"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nevar atjaunot datu nes�ju \"%s\"\n"
+msgid "unrequested"
+msgstr ""
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "%s konflik� ar %s"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "wget nav atrodams\n"
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"%s\n"
-"<relative path of hdlist> tr�kst\n"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "nevaru instal�t pakotni %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"Da�as piepras�tas pakotnes nevar tikt instal�tas:\n"
 "%s\n"
-"`with' tr�kst priek� ftp datu avota\n"
+"vai piekr�tat?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nevar izveidot datu nes�ju \"%s\"\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atvainojiet, nepareiza izv�le. M��iniet v�lreiz\n"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"Pielietojums: urpmi.removemedia [-a] <v�rds> ...\n"
-"kur <v�rds> ir datu nes�js, ko no�emt.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "K�da ir j�su izv�le? (1-%d) "
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nezin�mas opcijas '%s'\n"
+msgid "One of the following packages is needed to install %s:"
+msgstr "Lai instak�tu %s, ir nepiecie�ama viena no sekojo��m pakotn�m:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nav ko no�emt (lietojiet urpmi.addmedia, lai pievienotu datu nes�ju)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Tikai root dr�kst instal�t pakotnes"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"lietojums: urpmi.update [opcijas] <v�rds> ...\n"
-"kur <v�rds> atjaunin�m� datu nes�ja v�rds.\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - izveidot atjaunin��anas datu nes�ju.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Nevar�ju izveidot direktoriju [%s] k��du zi�ojumam"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nezin�ma opcija \"-%s\", p�rbaudiet pielietojumu ar --help\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"nav ko atjaunin�t (lietojiet urpmi.addmedia, lai pievienotu datu nes�ju)\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"atjunin�jum� tr�kst k�da ieraksta\n"
-"(viens no %s)\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1 ../urpmq: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"
-msgstr ""
-"urpmi versija %s\n"
-"Autorties�bas (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"�� ir br�va programmat�ra, un var tikt izplat�ta saska�� ar GNU GPL.\n"
-"\n"
-"pielietojums:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - run�gais re��ms.\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - klusais re��ms.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../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 "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - iz�emt rpm no ke�atmi�as, pirms dar�t ko citu.\n"
-
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - lietot X saskarni.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - lietot X saskarni.\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 ""
 
-#: ../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 ""
+"  --proxy-user   - nor�d�t lietot�ja v�rdu un paroli lieto�anai\n"
+"                   priek� proxy autentifik�cijas (form�ts ir <lietot�js:"
+"parole>).\n"
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\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 ""
+"  --proxy        - lietot nor�d�to HTTP proxy, porta numurs tiek pie�emts,\n"
+"                   ka ir 1080 p�c noklus��anas (form�ts ir <proxy_hosts[:"
+"ports]>).\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - lietot curl, lai ieg�tu att�lin�tos failus.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - lietot wget, lai ieg�tu att�lin�tos failus.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - klusais re��ms.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - run�gais re��ms.\n"
-
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nezin�ma opcija \"-%s\", p�rbaudiet pielietojumu ar --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nevar�ju izveidot direktoriju [%s] k��du zi�ojumam"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - iz�emt rpm no ke�atmi�as, pirms dar�t ko citu.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "Tikai root dr�kst instal�t pakotnes"
-
-#: ../urpmi_.c:349
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Lai instak�tu %s, ir nepiecie�ama viena no sekojo��m pakotn�m:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "K�da ir j�su izv�le? (1-%d) "
-
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atvainojiet, nepareiza izv�le. M��iniet v�lreiz\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr ""
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Da�as piepras�tas pakotnes nevar tikt instal�tas:\n"
-"%s\n"
-"vai piekr�tat?"
 
-#: ../urpmi_.c:402
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "nevaru instal�t pakotni %s"
-
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:409
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget nav atrodams\n"
+#: ../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"
+msgstr ""
+"urpmi versija %s\n"
+"Autorties�bas (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"�� ir br�va programmat�ra, un var tikt izplat�ta saska�� ar GNU GPL.\n"
+"\n"
+"pielietojums:\n"
 
-#: ../urpmi_.c:414
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s konflik� ar %s"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "nevar atjaunot datu nes�ju \"%s\"\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "nevar izveidot datu nes�ju \"%s\"\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 ""
-"Sekojo�as pakotnes ir j�no�em, lai uzlabotu citas:\n"
 "%s\n"
-"vai piekr�tat?"
+"`with' tr�kst priek� ftp datu avota\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 "Lai apmierin�tu atkar�bas, tiks instal�tas sekojo�as pakotnes (%d MB)"
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
+"%s\n"
+"<relative path of hdlist> tr�kst\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 ""
-"Jums j�b�t root, lai instal�tu sekojo�as atkar�bas:\n"
 "%s\n"
+"nav nepiecie�ams uzr�d�t <hdlist relat�vo ce�u> ar --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "nevar dab�t koda pakotnes, p�rtraucu"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "atg�stu rpm failus..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"nezin�mas opcijas '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "L�dzu ielieciet datu nes�ju \"%s\" ier�c� [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Nospiediet Enter, kad gatavs..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Sekojo��m pakotn�m ir slikti paraksti"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - fors�t hdlist failu �ener��anu.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "V�laties turpin�t instal��anu?"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - m��in�t atrast un lietot synthesis vai hdlist failu.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (j/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - izt�r�t ies�kumu ke�atmi�as direktoriju.\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 ""
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instal��ana neizdev�s"
+#: ../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 ""
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "izplatu %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Vai m��in�t instal�t bez atkar�bu p�rbaudes? (j/N) "
+#: ../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 ""
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Vai m��in�t instal�t v�l uzst�j�g�k (--force)? (j/N) "
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - autom�tiski veidot visas vides no instal�cijas datu "
+"nes�ja.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "viss jau ir instal�ts"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - izveidot atjaunin��anas datu nes�ju.\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 versija %s\n"
-"Autorties�bas (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"�� ir br�va programmat�ra, un var tikt izplat�ta saska�� ar GNU GPL "
-"noteikumiem.\n"
+"Pielietojums: urpmi.addmedia [opcijas] <v�rds> <url> [with "
+"<relat�vais_ce��>]\n"
+"kur <url> ir viens no\n"
+"       file://<ce��>\n"
+"       ftp://<lietot�ja_v�rds>:<parole>@<hosts>/<ce��> with <hdlist "
+"relat�vais faila v�rds>\n"
+"       ftp://<host>/<ce��> with <hdlist relat�vais faila v�rds>\n"
+"       http://<host>/<ce��> with <hdlist relat�vais faila v�rds>\n"
+"       removable://<ce��>\n"
 "\n"
-"pielietojums:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - izvad�t sarakstu ar pieejam�m pakotn�m.\n"
+"un [opcijas] ir no\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nav ko no�emt (lietojiet urpmi.addmedia, lai pievienotu datu nes�ju)\n"
 
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list         - izvad�t sarakstu ar pieejam�m pakotn�m.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr ""
 
-#: ../urpmq_.c:51
+#: ../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 ""
+"Pielietojums: urpmi.removemedia [-a] <v�rds> ...\n"
+"kur <v�rds> ir datu nes�js, ko no�emt.\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 ""
+"atjunin�jum� tr�kst k�da ieraksta\n"
+"(viens no %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"nav ko atjaunin�t (lietojiet urpmi.addmedia, lai pievienotu datu nes�ju)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - no�emt pakotni, ja ir uzinstal�ta jaun�ka versija.\n"
 
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    dota komandrind�; bez pakotnes v�rda)."
-
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  --X            - lietot X saskarni.\n"
-
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr ""
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - izveidot atjaunin��anas datu nes�ju.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"lietojums: urpmi.update [opcijas] <v�rds> ...\n"
+"kur <v�rds> atjaunin�m� datu nes�ja v�rds.\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versja %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Autorties�bas (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nezin�ma opcija \"-%s\", p�rbaudiet pielietojumu ar --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"�� ir br�v� programmat�ra, un dr�kst tikt izplat�ta saska�� ar GNU GPL."
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "pielietojums: urpmf [opcijas] <fails>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr ""
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
-"  --quiet         - nedruk�t iez�mes v�rdu (noklus�tais, ja iez�me nav dota"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    komandrind�, nesavienojams ar interakt�vo re��mu)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  --X            - lietot X saskarni.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - druk�t visas iez�mes."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    dota komandrind�; bez pakotnes v�rda)."
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - druk�t iez�mes v�rdu: rpm fila v�rds (pie�em, ja iez�me "
-"nav"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    dota komandrind�; bez pakotnes v�rda)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - druk�t iez�mi: grupa."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - druk�t iez�mi: izm�rs."
+"  -u             - no�emt pakotni, ja ir uzinstal�ta jaun�ka versija.\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - druk�t iez�mi: seri�lais numurs."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - druk�t iez�mi: kopsavilkums."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - druk�t iez�mui: apraksts."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - druk�t iez�mi: nodro�ina (vair�kas rindi�as)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list         - izvad�t sarakstu ar pieejam�m pakotn�m.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - druk�t iez�mi: nepiecie�amas (vair�kas rindi�as)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - druk�t iez�mi: faili (vair�kas rindi�as)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr ""
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr "  --conflicts     - druk�t iez�mi: konflikti (vair�kas rindi�as)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - izvad�t sarakstu ar pieejam�m pakotn�m.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr "  --obsoletes     - druk�t iez�mi: novecoju�as (vair�kas rindi�as)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - druk�t iez�mi: prereqs (vair�kas rindi�as)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "m��iniet urpmf --help priek� palpildus pal�dz�bas"
-
-#: placeholder.h:40
-msgid "no full media list was found"
+"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 ""
+"urpmq versija %s\n"
+"Autorties�bas (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"�� ir br�va programmat�ra, un var tikt izplat�ta saska�� ar GNU GPL "
+"noteikumiem.\n"
+"\n"
+"pielietojums:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl neizdev�s: beidz�s ar %d vai sign�lu %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Instal��ana neizdev�s mezgl� %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync nav atrodams\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync neizdev�s: beidz�s ar %d vai sign�lu %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh nav atrodams\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "sintakses k��da konfigur�cijas fail�, rind� %s"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Instal��ana neizdev�s mezgl� %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "Datu nes�js \"%s\" m��ina lietot jau pielietotu hdlist, datu nes�js tiek "
-#~ "ignor�ts"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "hostam %s nav labas urpmi versijas"
 
 #~ msgid "Remove them all?"
 #~ msgstr "No�emt t�s visas?"
diff --git a/po/ms.po b/po/ms.po
index 5abf3758..5a603494 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,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: 2002-03-12 16:17+0800\n"
 "Last-Translator: Yuzz <yuzz@emasonline.com>\n"
 "Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -14,1575 +14,1687 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instal %s\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 "Yy"
+
+#. 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 "NnTt"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versi %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Hakcipta (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 "Ini perisian percuma dan boleh disebar semula mengikut lesen awam GNU."
+
+#: placeholder.h:21 placeholder.h:38
+#, fuzzy
+msgid "usage: urpmf [options] <file>"
+msgstr "penggunaan: urpmf [options] <file>"
+
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
-"Instalasi pakej automatik...\n"
-"Anda telah meminta instalasi pakej %s\n"
+"  --quiet         - jangan cetak nama tag (lalai jika tiada tag pada baris"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Semua OK?"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    baris, tidak serasi dgn mod interaktif)."
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - cetak semua tag."
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Batal"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - cetak nama tag: rpm nama fail (jika tiada diberikan pada"
 
-#: ../_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 "NnTt"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    baris arahan tapi tanpa nama pakej)."
 
-#: ../_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 "Yy"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - cetak kumpulan tag: kumpulan."
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (Y/t) "
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - cetak ukuran tag: ukuran."
 
-#: ../_irpm_.c:63
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - cetak no. serial tag: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - cetak ringkasan tag: ringkasan."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - cetak penjelasan tag: penjelasan."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - cetak sediaan tag: semua sediaan (beberapa baris)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - cetak keperluan tag: semua keperluan (beberapa baris)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - cetak fail tag: semua fail (bbrp baris)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr "  --conflicts     - cetak konflik tag: semua konflik (beberapa baris)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - cetak syarat tag: semua syarat (beberapa baris)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "cuba urpmf --bantuan utk pilihan lain"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "Senarai media lengkap tidak dijumpai"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: arahan tidak dijumpai\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (Y/t) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
+msgid "Cancel"
+msgstr "Batal"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Semua OK?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Instalasi pakej automatik...\n"
+"Anda telah meminta instalasi pakej %s\n"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "tiada webfetch (curl / wget) dijumpai\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instal %s\n"
 
-#: ../urpm.pm_.c:226
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "gagal bangun hdlist: %s"
+msgid "unable to open rpmdb"
+msgstr "pendaftaran fail rpm gagal"
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...gagal disalin"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget hilang\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget gagal: keluar dgn %d atau isyarat %d\n"
+msgid "%s is needed by %s"
+msgstr ""
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl hilang\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "media \"%s\" cuba memakai senarai yg telah dipakai, media diabaikan"
+msgid "unable to remove package %s"
+msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../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"
+msgid "Preparing..."
 msgstr ""
-"gagal guna media \"%s\" sbg senarai fail kerana telah digunakan oleh media "
-"lain"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "\"%s\" telah dipakai, tidak dapat digunakan utk media tak bernama"
+msgid "...retrieving failed: %s"
+msgstr "...gagal terambil: %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "media \"%s\" tidak terpakai kerana senarai fail [%s] tiada"
+msgid "...retrieving done"
+msgstr "...capaian selesai"
 
-#: ../urpm.pm_.c:589
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "gagal tentukan media fail hdlist [%s] ini"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "ambil fail rpms..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "gagal mengakses fail hdlist \"%s\", media diabaikan"
+msgid "malformed input: [%s]"
+msgstr "input cacat: [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "gagal mengakses fail list \"%s\", media diabaikan"
+msgid "unable to access medium \"%s\""
+msgstr "gagal akses media \"%s\""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "cuba lepaslalu media sedia ada\"%s\", abaikan"
+msgid "urpmi database locked"
+msgstr "database urpmi terkunci"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "gagal temui fail hdlist \"%s\", media diabaikan"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "gagal cari fail daftar \"%s\", media diabaikan"
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" tidak dipilih"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "ketidaksinambungan senarai fail \"%s\", media diabaikan"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "gagal periksa senarai fail \"%s\", media diabaikan"
+msgid "package %s is not found."
+msgstr "pakej %s tidak dijumpai."
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "terlalu banyak titik sambung utk media removable \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ambil peranti removable sbg \"%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:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "pakai removable peranti lain [%s] untuk \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "banyak pakej dgn nama fail rpm sama \"%s\""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "gagal olah dgn benar [%s] pada nilai \"%s\""
+
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
+msgid "The following packages contain %s: %s"
+msgstr "Pakej berikut mengandungi %s: %s"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "gagal tulis fail konfigurasi [%s]"
+msgid "no package named %s"
+msgstr "tiada pakej bernama %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "tulis fail konfigurasi [%s]"
+msgid "error registering local packages"
+msgstr "ralat pendaftaran pakej setempat"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to register rpm file"
 msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "periksa baca fail hdlist [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "ambil fail rpms..."
 
-#: ../urpm.pm_.c:776
-#, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "nama fail rpm [%s] tidak sah"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "no entries relocated in depslist"
+msgstr "tiada masukan direlokasikan dlm depslist"
 
-#: ../urpm.pm_.c:784
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "gagal kemaskini media \"%s\"\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "%s kemasukan di depslist direlokasikan"
 
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "  --all           - cetak semua tag."
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "unmount %s"
 
-#: ../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 "mounting %s"
+msgstr "mounting %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "hapus %d header usang dlm kache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "menemui %d header dalam kache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "periksa baca fail hdlist [%s]"
 
-#: ../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]"
 msgstr "periksa file sintesis [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
+#, c-format
+msgid "building hdlist [%s]"
+msgstr "bangun hdlist [%s]"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
+msgid "reading headers from medium \"%s\""
+msgstr "hapus media \"%s\""
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "pendaftaran fail rpm gagal"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "media \"%s\" telah ada"
+msgid "nothing written in list file for \"%s\""
+msgstr "tiada yg ditulis dalam fail daftar \"%s\""
 
-#: ../urpm.pm_.c:918
-#, c-format
-msgid "added medium %s"
-msgstr "media %s ditambahkan"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "gagal mengakses media instalasi pertama"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "gagal baca senarai fail \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "sedang menyalin fail hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...salin selesai"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "gagal mengolah fail hdlist \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...salin selesai"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../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)"
-msgstr ""
-"gagal mengakses media instalasi pertama (fail Mandrake/base/hdlists tidak "
-"dijumpai)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "gagal mengambil hdlist (atau sintesis) source"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "ambil fail hdlist..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "periksa baca fail hdlist [%s]"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...capaian selesai"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...gagal terambil: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "mencapai hdlist sumber (atau sintesis) \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "deskripsi hdlist yang tidak sah \"%s\" dalam fail hdlist"
+msgid "retrieving description file of \"%s\"..."
+msgstr "ambil fail deskripsi \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "sedang cuba memilih media yg tidak wujud \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "tiada fail rpm dijumpai dari [%s]"
 
-#: ../urpm.pm_.c:1019
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "sedang cuba memilih media majmuk: %s"
+msgid "reading rpm files from [%s]"
+msgstr "tiada fail rpm dijumpai dari [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "hapus media \"%s\""
+msgid "...copying done"
+msgstr "...salin selesai"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "database urpmi terkunci"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...salin selesai"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "gagal akses media \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "penyalinan senarai sumber \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "fail deskripsi \"%s\" sedang disalin"
+msgid "copy of [%s] failed"
+msgstr "gagal salin [%s]"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "gagal salin [%s]"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "periksa baca fail hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "fail deskripsi \"%s\" sedang disalin"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "penyalinan senarai sumber \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "hapus media \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "tiada fail rpm dijumpai dari [%s]"
+msgid "selecting multiple media: %s"
+msgstr "sedang cuba memilih media majmuk: %s"
 
-#: ../urpm.pm_.c:1267
-#, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "gagal baca fail rpm [%s] dari media \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "tiada fail rpm dijumpai dari [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "sedang cuba memilih media yg tidak wujud \"%s\""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "ambil fail deskripsi \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"gagal mengakses media instalasi pertama (fail Mandrake/base/hdlists tidak "
+"dijumpai)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "mencapai hdlist sumber (atau sintesis) \"%s\"..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "deskripsi hdlist yang tidak sah \"%s\" dalam fail hdlist"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "gagal mengambil hdlist (atau sintesis) source"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving hdlists file..."
+msgstr "ambil fail hdlist..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "fail hdlist utk media \"%s\" tak dijumpai"
+msgid "copying hdlists file..."
+msgstr "sedang menyalin fail hdlist..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr ""
+msgid "unable to access first installation medium"
+msgstr "gagal mengakses media instalasi pertama"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "gagal mengolah fail hdlist \"%s\""
+msgid "added medium %s"
+msgstr "media %s ditambahkan"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "gagal baca senarai fail \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" telah ada"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "fail hdlist utk media \"%s\" tak dijumpai"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpm.pm_.c:1528
-#, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "tiada yg ditulis dalam fail daftar \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "  --all           - cetak semua tag."
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "gagal kemaskini media \"%s\"\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "hapus media \"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpm.pm_.c:1597
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "bangun hdlist [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "periksa baca fail hdlist [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "menemui %d header dalam kache"
+msgid "write config file [%s]"
+msgstr "tulis fail konfigurasi [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "hapus %d header usang dlm kache"
+msgid "unable to write config file [%s]"
+msgstr "gagal tulis fail konfigurasi [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "mounting %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "unmount %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "pakai removable peranti lain [%s] untuk \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s kemasukan di depslist direlokasikan"
+msgid "taking removable device as \"%s\""
+msgstr "ambil peranti removable sbg \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "tiada masukan direlokasikan dlm depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "terlalu banyak titik sambung utk media removable \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nama fail rpm [%s] tidak sah"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "gagal periksa senarai fail \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "ambil fail rpms..."
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "ketidaksinambungan senarai fail \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "gagal akses fail rpm [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "gagal cari fail daftar \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "gagal akses fail rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "gagal temui fail hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "ralat pendaftaran pakej setempat"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "cuba lepaslalu media sedia ada\"%s\", abaikan"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "tiada pakej bernama %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "gagal mengakses fail list \"%s\", media diabaikan"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Pakej berikut mengandungi %s: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "gagal mengakses fail hdlist \"%s\", media diabaikan"
 
-#: ../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\""
-msgstr "banyak pakej dgn nama fail rpm sama \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "gagal tentukan media fail hdlist [%s] ini"
 
-#: ../urpm.pm_.c:2147
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "gagal olah dgn benar [%s] pada nilai \"%s\""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "media \"%s\" tidak terpakai kerana senarai fail [%s] tiada"
 
-#: ../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)"
-msgstr ""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "\"%s\" telah dipakai, tidak dapat digunakan utk media tak bernama"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"gagal guna media \"%s\" sbg senarai fail kerana telah digunakan oleh media "
+"lain"
 
-#: ../urpm.pm_.c:2183
-#, c-format
-msgid "package %s is not found."
-msgstr "pakej %s tidak dijumpai."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "media \"%s\" cuba memakai senarai yg telah dipakai, media diabaikan"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" tidak dipilih"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "media \"%s\" cuba memakai hdlist yg telah dipakai, media diabaikan"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "gagal baca fail rpm [%s] dari media \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "ralat sinteks dlm fail konfigurasi pada baris %s"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "input cacat: [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "ambil fail rpms..."
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr ""
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "curl gagal: keluar dgn %d atau isyarat %d\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "Hanya superuser yang boleh menginstal pakej"
+msgid "ssh is missing\n"
+msgstr "wget hilang\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Hanya superuser yang boleh menginstal pakej"
+msgid "rsync is missing\n"
+msgstr "curl hilang\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr ""
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl gagal: keluar dgn %d atau isyarat %d\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../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 ""
+msgid "curl is missing\n"
+msgstr "curl hilang\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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget gagal: keluar dgn %d atau isyarat %d\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "wget is missing\n"
+msgstr "wget hilang\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Instalasi gagal"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-#, fuzzy
-msgid "Installation is possible"
-msgstr "Instalasi gagal"
+msgid "copy failed: %s"
+msgstr "...gagal disalin"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Instalasi gagal"
+msgid "unable to handle protocol: %s"
+msgstr "gagal bangun hdlist: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr ""
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "tiada webfetch (curl / wget) dijumpai\n"
 
-#: ../urpme_.c:39
-#, fuzzy, 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"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
 msgstr ""
-"urpmi versi %s\n"
-"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini perisian percuma dan boleh disebar mengikut kesesuaian lesen publik "
-"GNU.\n"
-"\n"
-"penggunaan:\n"
 
-#: ../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         - cetak mesej bantuan ini.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-#, fuzzy
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
-"  --auto         - secara automatik memilih pakej yg baik dalam pilihan.\n"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "...gagal disalin"
+
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Tiada yang dihapus.\n"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: pilihan \"-%s\" tidak dikenali, periksa penggunaan dgn --help\n"
+msgid "removing package %s will break your system"
+msgstr "menghapuskan pakej %s akan merosakkan sistem anda\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "pakej tidak dikenal "
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "pakej tidak dikenal "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "menghapuskan pakej %s akan merosakkan sistem anda\n"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: pilihan \"-%s\" tidak dikenali, periksa penggunaan dgn --help\n"
 
-#: ../urpme_.c:95
-#, fuzzy
-msgid "Nothing to remove"
-msgstr "Tiada yang dihapus.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Salah satu pakej berikut diperlukan:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
-msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "...gagal disalin"
+#: ../urpme:1 ../urpmi:1
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - secara automatik memilih pakej yg baik dalam pilihan.\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         - cetak mesej bantuan ini.\n"
 
-#: ../urpmf_.c:26
+#: ../urpme:1
 #, fuzzy, 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 ""
-"urpmq versi %s\n"
-"HakCipta (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini adalah perisian percuma dan boleh disebar mengikut kesesuaian GNU GPL.\n"
+"urpmi versi %s\n"
+"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini perisian percuma dan boleh disebar mengikut kesesuaian lesen publik "
+"GNU.\n"
 "\n"
 "penggunaan:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - pakai hanya media tersenarai dgn koma.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - mod verbos.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
+"  -u             - hapus pakej jika versi yg lebih baik telah diinstal.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - jangan cetak nama tag (lalai jika tiada tag pada baris"
 
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - cetak semua tag."
-
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - cetak nama tag: rpm nama fail (jika tiada diberikan pada"
+"  -u             - hapus pakej jika versi yg lebih baik telah diinstal.\n"
 
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - cetak kumpulan tag: kumpulan."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - cetak ukuran tag: ukuran."
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
 
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - cetak ukuran tag: ukuran."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - paksa buat fail hdlist.\n"
 
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - cetak ringkasan tag: ringkasan."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+"  --obsoletes     - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - cetak penjelasan tag: penjelasan."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr "  --conflicts     - cetak konflik tag: semua konflik (beberapa baris)."
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr "  --provides      - cetak sediaan tag: semua sediaan (beberapa baris)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - cetak fail tag: semua fail (bbrp baris)."
 
-#: ../urpmf_.c:47
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 "  --requires      - cetak keperluan tag: semua keperluan (beberapa baris)."
 
-#: ../urpmf_.c:48
-#, fuzzy
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - cetak fail tag: semua fail (bbrp baris)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+msgstr "  --provides      - cetak sediaan tag: semua sediaan (beberapa baris)."
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr "  --conflicts     - cetak konflik tag: semua konflik (beberapa baris)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - cetak penjelasan tag: penjelasan."
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - cetak ringkasan tag: ringkasan."
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - paksa buat fail hdlist.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - cetak ukuran tag: ukuran."
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - cetak ukuran tag: ukuran."
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - bersihkan direktori kache header.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - cetak kumpulan tag: kumpulan."
 
-#: ../urpmf_.c:54
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -u             - hapus pakej jika versi yg lebih baik telah diinstal.\n"
+"  --name          - cetak nama tag: rpm nama fail (jika tiada diberikan pada"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - cetak semua tag."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - jangan cetak nama tag (lalai jika tiada tag pada baris"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  -u             - hapus pakej jika versi yg lebih baik telah diinstal.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - mod verbos.\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - pakai hanya media tersenarai dgn koma.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"penggunaan: urpmi.addmedia [pilihan] <nama> <url> [with <path_relatif>]\n"
-"keterangan: <url> adalah\n"
-"       file://<path>\n"
-"       ftp://<login>:<sandi>@<host>/<path> with <namafail relatif hdlist>\n"
-"       ftp://<host>/<path> with <namafail relatif hdlist>\n"
-"       http://<host>/<path> with <namafail relatif hdlist>\n"
-"       removable://<path>\n"
+"urpmq versi %s\n"
+"HakCipta (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini adalah perisian percuma dan boleh disebar mengikut kesesuaian GNU GPL.\n"
 "\n"
-"dan [pilihan] dari\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         - guna wget utk mengambil fail jauh.\n"
+"penggunaan:\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         - guna curl utk mengambil fail jauh.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "semua telah diinstal"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Instalasi gagal"
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalasi gagal"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - buat media update.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
 
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - buat semua media dari media instalasi dgn automatis.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "instal %s\n"
 
-#: ../urpmi.addmedia_.c:64
+#: ../urpmi:1
+#, fuzzy, 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"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"Instalasi gagal, beberapa file hilang.\n"
+"Anda mungkin perlu mengemaskini database urpmi"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-
-#: ../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"
-msgstr ""
+msgid " (y/N) "
+msgstr " (y/T) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - bersihkan direktori kache header.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Pakej berikut mengandungi %s: %s"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr "  -h             - cuba mencari dan guna fail sintesis atau hdlist.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Tekan [Enter] jika selesai.."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - paksa buat fail hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Masukkan media \"%s\" ke peranti [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"tak perlu memberikan <path relatif hdlist> dgn --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "gagal kemaskini media \"%s\"\n"
+"Pakej berikut akan diinstal agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
 "%s\n"
-"<path relatif hdlist> hilang\n"
 
-#: ../urpmi.addmedia_.c:205
-#, c-format
+#: ../urpmi:1
+#, fuzzy, 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 ""
-"%s\n"
-"`with' hilang utk media ftp\n"
+"beberapa pakej harus dihapuskan agar ter-upgrade, ini belum disokong lagi\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "gagal membuat media \"%s\"\n"
+msgid "unrequested"
+msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
-"penggunan: urpmi.removemedia [-a] <nama> ...\n"
-"<nama> adalah nama media yg akan dihapus.\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - pilih semua media.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "wget hilang\n"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"\n"
-"pilihan tidak diketahui '%s'\n"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "tiada penghapusan (guna urpmi.addmedia utk tambah media)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../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 ""
-"masukan utk penghapusan hilang\n"
-"(satu dari %s)\n"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"penggunaan: urpmi.update [pilihan] <nama> ...\n"
-"<nama> adalah media yg akan dikemaskini.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Salah pilih, cuba lagi\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - pilih semua media non-removable.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d             - paksa perhitungan lengkap fail depslist.tersusun.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Salah satu pakej berikut diperlukan utk instalasi %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"masukan kemaskini hilang\n"
-"(satu dari %s)\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "gagal olah dgn benar [%s] pada nilai \"%s\""
+
+#: ../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 "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"urpmi versi %s\n"
-"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini perisian percuma dan boleh disebar mengikut kesesuaian lesen publik "
-"GNU.\n"
-"\n"
-"penggunaan:\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: pilihan \"-%s\" tidak dikenali, periksa penggunaan dgn --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-#, fuzzy
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automatik memilih pakej utk upgrade sistem.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  nama atau fail rpm yg tertera pada baris arahan telah diinstal.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mod verbos.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mod diam.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
+"  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
-#: ../urpmi_.c:81
-#, fuzzy
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - paksa instal meskipun beberapa pakej tiada.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpmi_.c:86
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --media        - pakai hanya media tersenarai dgn koma.\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
+"  --best-output  - pilih antaramuka terbaik menurut persekitaran:\n"
+"                   X atau mode teks.\n"
 
-#: ../urpmi_.c:100
+#: ../urpmi:1
+#, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - guna antaramuka X.\n"
 
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --best-output  - pilih antaramuka terbaik menurut persekitaran:\n"
-"                   X atau mode teks.\n"
 
-#: ../urpmi_.c:103
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-#, fuzzy
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --media        - pakai hanya media tersenarai dgn koma.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\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-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mod diam.\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 ""
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mod verbos.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr ""
 
-#: ../urpmi_.c:114
-#, fuzzy
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  nama atau fail rpm yg tertera pada baris arahan telah diinstal.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - guna curl utk mengambil fail jauh.\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: pilihan \"-%s\" tidak dikenali, periksa penggunaan dgn --help\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi_.c:223
-#, fuzzy, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "gagal olah dgn benar [%s] pada nilai \"%s\""
-
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Hanya superuser yang boleh menginstal pakej"
-
-#: ../urpmi_.c:349
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Salah satu pakej berikut diperlukan utk instalasi %s:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Salah satu pakej berikut diperlukan:"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - paksa instal meskipun beberapa pakej tiada.\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Pilihan Anda? (1-%d) "
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Salah pilih, cuba lagi\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:402
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "Hanya superuser yang boleh menginstal pakej"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget hilang\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - automatik memilih pakej utk upgrade sistem.\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi:1
 #, c-format
-msgid "due to conflicts with %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:416
-msgid "unrequested"
+#: ../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"
 msgstr ""
+"urpmi versi %s\n"
+"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini perisian percuma dan boleh disebar mengikut kesesuaian lesen publik "
+"GNU.\n"
+"\n"
+"penggunaan:\n"
 
-#: ../urpmi_.c:421
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "gagal kemaskini media \"%s\"\n"
+
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "gagal membuat media \"%s\"\n"
+
+#: ../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 ""
-"beberapa pakej harus dihapuskan agar ter-upgrade, ini belum disokong lagi\n"
+"%s\n"
+"`with' hilang utk media ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Pakej berikut akan diinstal agar syarat kebergantungan dipenuhi (%d MB)"
+"%s\n"
+"<path relatif hdlist> hilang\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 ""
-"Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
 "%s\n"
+"tak perlu memberikan <path relatif hdlist> dgn --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "tidak dapat mengambil pakej asal, batal"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "ambil fail rpms..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"pilihan tidak diketahui '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Masukkan media \"%s\" ke peranti [%s]"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - paksa buat fail hdlist.\n"
 
-#: ../urpmi_.c:508
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "Tekan [Enter] jika selesai.."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr "  -h             - cuba mencari dan guna fail sintesis atau hdlist.\n"
 
-#: ../urpmi_.c:527
-#, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Pakej berikut mengandungi %s: %s"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (y/T) "
+#: ../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 ""
 
-#: ../urpmi_.c:548
-#, fuzzy, c-format
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"Instalasi gagal, beberapa file hilang.\n"
-"Anda mungkin perlu mengemaskini database urpmi"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instalasi gagal"
+#: ../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 ""
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "instal %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - buat semua media dari media instalasi dgn automatis.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "semua telah diinstal"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - buat media update.\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 versi %s\n"
-"HakCipta (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini adalah perisian percuma dan boleh disebar mengikut kesesuaian GNU GPL.\n"
+"penggunaan: urpmi.addmedia [pilihan] <nama> <url> [with <path_relatif>]\n"
+"keterangan: <url> adalah\n"
+"       file://<path>\n"
+"       ftp://<login>:<sandi>@<host>/<path> with <namafail relatif hdlist>\n"
+"       ftp://<host>/<path> with <namafail relatif hdlist>\n"
+"       http://<host>/<path> with <namafail relatif hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"penggunaan:\n"
-
-#: ../urpmq_.c:46
-#, fuzzy
-msgid "  --list         - list available packages.\n"
-msgstr "  --all           - cetak semua tag."
+"dan [pilihan] dari\n"
 
-#: ../urpmq_.c:47
-#, fuzzy
-msgid "  --list-media   - list available media.\n"
-msgstr "  --all           - cetak semua tag."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"masukan utk penghapusan hilang\n"
+"(satu dari %s)\n"
 
-#: ../urpmq_.c:48
-#, fuzzy
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --all           - cetak semua tag."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "tiada penghapusan (guna urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --all           - cetak semua tag."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - pilih semua media.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - keluarkan header senarai pakej  dari dalam db urpmi ke\n"
-"                   stdout (hanya root).\n"
+"penggunan: urpmi.removemedia [-a] <nama> ...\n"
+"<nama> adalah nama media yg akan dihapus.\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      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
-
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - tambah pencarian ke kebergantungan pakej.\n"
+"masukan kemaskini hilang\n"
+"(satu dari %s)\n"
 
-#: ../urpmq_.c:64
-#, fuzzy
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"  -u             - hapus pakej jika versi yg lebih baik telah diinstal.\n"
-
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    baris arahan tapi tanpa nama pakej)."
+"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d             - paksa perhitungan lengkap fail depslist.tersusun.\n"
 
-#: ../urpmq_.c:70
-#, fuzzy
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - juga cetak kumpulan dgn nama.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - pilih semua media non-removable.\n"
 
-#: ../urpmq_.c:71
-#, fuzzy
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - juga cetak versi dan keluaran dgn nama.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"penggunaan: urpmi.update [pilihan] <nama> ...\n"
+"<nama> adalah media yg akan dikemaskini.\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - cetak semua tag."
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versi %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Hakcipta (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: pilihan asing \"-%s\", periksa pemakaian dgn --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr "Ini perisian percuma dan boleh disebar semula mengikut lesen awam GNU."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
 
-#: placeholder.h:21 placeholder.h:38
-#, fuzzy
-msgid "usage: urpmf [options] <file>"
-msgstr "penggunaan: urpmf [options] <file>"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - juga cetak versi dan keluaran dgn nama.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - jangan cetak nama tag (lalai jika tiada tag pada baris"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - juga cetak kumpulan dgn nama.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    baris, tidak serasi dgn mod interaktif)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - cetak semua tag."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    baris arahan tapi tanpa nama pakej)."
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - cetak nama tag: rpm nama fail (jika tiada diberikan pada"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    baris arahan tapi tanpa nama pakej)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - cetak kumpulan tag: kumpulan."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - cetak ukuran tag: ukuran."
+"  -u             - hapus pakej jika versi yg lebih baik telah diinstal.\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - cetak no. serial tag: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - tambah pencarian ke kebergantungan pakej.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - cetak ringkasan tag: ringkasan."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - cetak penjelasan tag: penjelasan."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - keluarkan header senarai pakej  dari dalam db urpmi ke\n"
+"                   stdout (hanya root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - cetak sediaan tag: semua sediaan (beberapa baris)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --all           - cetak semua tag."
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr ""
-"  --requires      - cetak keperluan tag: semua keperluan (beberapa baris)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --all           - cetak semua tag."
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - cetak fail tag: semua fail (bbrp baris)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --all           - cetak semua tag."
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr "  --conflicts     - cetak konflik tag: semua konflik (beberapa baris)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --all           - cetak semua tag."
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (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 ""
-"  --obsoletes     - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - cetak syarat tag: semua syarat (beberapa baris)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "cuba urpmf --bantuan utk pilihan lain"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "Senarai media lengkap tidak dijumpai"
+"urpmq versi %s\n"
+"HakCipta (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini adalah perisian percuma dan boleh disebar mengikut kesesuaian GNU GPL.\n"
+"\n"
+"penggunaan:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl gagal: keluar dgn %d atau isyarat %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalasi gagal"
 
-#, fuzzy
-#~ msgid "rsync is missing\n"
-#~ msgstr "curl hilang\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
 
-#, fuzzy
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "curl gagal: keluar dgn %d atau isyarat %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
 
-#, fuzzy
-#~ msgid "ssh is missing\n"
-#~ msgstr "wget hilang\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "ralat sinteks dlm fail konfigurasi pada baris %s"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Instalasi gagal"
 
-#, fuzzy
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr "media \"%s\" cuba memakai hdlist yg telah dipakai, media diabaikan"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr ""
 
 #~ msgid "Remove them all?"
 #~ msgstr "Hapus semua?"
@@ -1604,12 +1716,6 @@ msgstr "Senarai media lengkap tidak dijumpai"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - cetak mesej bantuan ini.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: pilihan asing \"-%s\", periksa pemakaian dgn --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr "gagal buat fail sintesis media \"%s\""
 
diff --git a/po/mt.po b/po/mt.po
index 4283a746..cd5b782a 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-mt\n"
-"POT-Creation-Date: 2003-03-05 19:38+0100\n"
+"POT-Creation-Date: 2003-03-05 21:19+0100\n"
 "PO-Revision-Date: 2002-09-05 19:42CET\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -14,1146 +14,1255 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "qed jiġi nstallat %s\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 "IiYy"
+
+#. 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 "LlNn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf verżjoni %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Installazzjoni awtomatika ta' pakketti...\n"
-"Int tlabt l-installazzjoni tal-pakkett %s\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Tajjeb?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "użu: urpmf [għażliet] <fajl>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr "  --quiet         - turix l-isem (impliċitu jekk il-kmand ma fihx tag,"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Ikkanċella"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    inkompatibbli mal-modalità interattiv)."
 
-#: ../_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 "LlNn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - uri t-tags kollha."
 
-#: ../_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 "IiYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - uri l-isem: isem tal-fajl rpm (impliċitu jekk ma tingħata"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (I/l) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    ebda tag fil-kmand, iżda minngħajr pakkett)"
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - uri l-grupp."
 
-#: ../_irpm_.c:63
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - uri d-daqs."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - uri n-numru tas-serje"
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - uri sommarju"
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - uri deskrizzjoni"
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - uri \"provides\" - kull ma jipprovdi (diversi linji)"
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ (diversi linji)"
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - uri \"files\": il-files kollha (diversi linji)"
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - uri \"conflicts\": kull ma joħloq konflitt (diversi "
+"linji)"
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\" (diversi linji)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - ipprintja l-prirekwiżiti (diversi linji)"
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "ipprova urpmf --help għal iżjed għażliet"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "ma nstabet ebda lista sħiħa ta' sorsi"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: kmand ma nstabx\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "\"webfetch\" mhux magħruf `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (I/l) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protokoll mhux magħruf definit għal %s"
+msgid "Cancel"
+msgstr "Ikkanċella"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "ebda webfetch (curl jew wget bħalissa) ma nstab\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ma nistax nuża l-protokoll: %s"
+msgid "Is this OK?"
+msgstr "Tajjeb?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Installazzjoni awtomatika ta' pakketti...\n"
+"Int tlabt l-installazzjoni tal-pakkett %s\n"
+
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "qed jiġi nstallat %s\n"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...ikkupjar falla"
+msgid "unable to open rpmdb"
+msgstr "ma nistax nirreġistra fajl rpm"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget m'hux installat\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "ma nistax naċċessa l-fajl rpm [%s]"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget falla: ħareġ b' %d jew sinjal %d\n"
+msgid "%s conflicts with %s"
+msgstr "%s jikkonfliġġi ma' %s"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl ma jeżistix\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr "%s huwa meħtieġ minn %s"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "is-sors \"%s\" jipprova juża lista diġà użata, sors injorat"
+msgid "unable to install package %s"
+msgstr "ma nistax ninstalla l-pakkett %s"
 
-#: ../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 ""
-"ma nistax nieħu ħsieb is-sors \"%s\" peress li l-fajl tal-lista diġà qed "
-"jintuża minn sors ieħor"
+msgid "unable to remove package %s"
+msgstr "ma nistax inneħħi l-pakkett %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "ma nistax nuża l-isem \"%s\" għas-sors għax diġà qed jintuża"
+msgid "Preparing..."
+msgstr "Qed nipprepara..."
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"ma nistax nuża s-sors \"%s\" peress li ma jeżistix fajl ta' lista \"%s\""
+msgid "...retrieving failed: %s"
+msgstr "...qari falla: %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ma nistax niddetermina s-sors ta' dan il-fajl hdlist [%s]"
+msgid "...retrieving done"
+msgstr "...qari lest"
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "qed jinġabu l-fajls rpm..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ma nistax naċċessa l-fajl hdlist ta' \"%s\", sors injorat"
+msgid "malformed input: [%s]"
+msgstr "input iffurmat ħażin [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ma nistax naċċessa l-fajl tal-lista \"%s\", sors injorat"
+msgid "unable to access medium \"%s\""
+msgstr "ma nistax naċċessa s-sors \"%s\""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "qed nipprova naqbeż is-sors eżistenti \"%s\""
+msgid "urpmi database locked"
+msgstr "database urpmi imsakkar"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ma nistax insib il-fajl hdlist għal \"%s\", sors injorat"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "sors \"%s\" immarkat li jista' jitneħħa, imma m'hux"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ma nistax insib il-fajl tal-lista għal \"%s\", sors injorat."
+msgid "medium \"%s\" is not selected"
+msgstr "sors \"%s\" mhuwiex magħżul"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "fajl tal-lista ta' \"%s\" ma jinftehimx, sors injorat"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ma nistax naqra l-rpm [%s] mis-sors \"%s\""
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ma nistax jispezzjona l-fajl tal-lista għal \"%s\", sors injorat"
+msgid "package %s is not found."
+msgstr "pakkett %s ma nstabx."
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "wisq punti ta' mmuntar għas-sors li jitneħħa \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "qed nieħu l-apparat li jitneħħa bħala \"%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:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "qed jintuża apparat [%s] għal \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "hemm diversi pakketti bl-istess isem ta' rpm \"%s\""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ma nistax nikseb il-path għal sors li jitneħħa \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ma nistax nifli sew [%s] fuq il-valur \"%s\""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Dawn il-pakketti fihom %s: %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
+msgid "no package named %s"
+msgstr "ebda pakkett imsejjaħ %s"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "ma nistax nifli \"%s\" fil-fajl [%s]"
+msgid "error registering local packages"
+msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "ma nistax naċċessa l-fajl rpm [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "qed jinġabu l-fajls rpm..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "qed jiġi eżaminat \"parallel handler\" fil-fajl [%s]"
+msgid "invalid rpm file name [%s]"
+msgstr "isem tal-fajl rpm [%s] invalidu"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "instab \"parallel handler\" għal nodi: %s"
+msgid "no entries relocated in depslist"
+msgstr "ebda element relokat f' deplist"
 
-#: ../urpm.pm_.c:780
-#, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "qed tintuża medja assoċjata għal modalità parallela: %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "%s elementi relokati f' depslist"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ma nistax nuża għażla parallela \"%s\""
+msgid "unmounting %s"
+msgstr "qed niżmonta %s"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis ma jistax jintuża ma' --media, --update jew --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "qed jiġi mmuntat %s"
 
-#: ../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 "removing %d obsolete headers in cache"
+msgstr "qed inneħħi %d headers antiki mill-cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "instabu %d headers fil-cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
 
-#: ../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]"
 msgstr "qed jiġi eżaminat il-fajl ta' sinteżi [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problema fil-qari tal-hdlist għas-sors \"%s\""
+msgid "building hdlist [%s]"
+msgstr "qed jinbena hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "Qed ngħaddi t-tieni passata biex niddetermina dipendenzi\n"
 
-#: ../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\""
 msgstr "problema fil-qari tas-sinteżi għas-sors \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "ma nistax nirreġistra fajl rpm"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "sors \"%s\" diġà jeżisti"
+msgid "nothing written in list file for \"%s\""
+msgstr "ma nkiteb xejn fil-lista għal \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "ġie miżjud is-sors %s"
+msgid "unable to write list file of \"%s\""
+msgstr "ma nistax nikteb il-fajl tal-lista \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "ma nistax naċċessa l-ewwel sors ta' installazzjoni"
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fajl [%s] diġà użat fl-istess medjum \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "qed nikkopja l-fajl hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ma nistax nifli l-fajl hdlist ta' \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...ikkupjar lest"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...ikkupjar lest"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "il-qari tal-hdlist jew sinteżi sors falla."
 
-#: ../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)"
-msgstr ""
-"ma nistax naċċessa l-ewwel sors ta' installazzjoni (ma nstabx il-fajl "
-"Mandrake/base/hdlists)"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "qed naqra l-fajl \"hdlists\"..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "qed nikkopja l-hdlist (jew sinteżi) sors ta' \"%s\"..."
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...qari lest"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...qari falla: %s"
+msgid "retrieving description file of \"%s\"..."
+msgstr "qed nikseb il-fajl ta' deskrizzjoni għal \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "deskrizzjoni tal-hdlist \"%s\" invalida fil-fajl hdlist"
+msgid "no rpm files found from [%s]"
+msgstr "ebda fajls rpm ma nstabu minn [%s]"
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ma setgħux jinqraw l-fajls rpm minn [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "reading rpm files from [%s]"
+msgstr "qed jinqraw fajls rpm minn [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "qed nagħżel sors multiplu: %s"
+msgid "...copying done"
+msgstr "...ikkupjar lest"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...ikkupjar lest"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "qed jitneħħa s-sors \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "qed tiġi kkopjata l-lista sors ta' \"%s\"..."
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "database urpmi imsakkar"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "ikkupjar ta' [%s] falla"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ma nistax naċċessa s-sors \"%s\""
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "qed nikkopja l-hdlist (jew sinteżi) sors ta' \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "qed nikkopja l-hdlist (jew sinteżi) sors ta' \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "qed jitneħħa s-sors \"%s\""
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "ikkupjar ta' [%s] falla"
+msgid "selecting multiple media: %s"
+msgstr "qed nagħżel sors multiplu: %s"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "qed tiġi kkopjata l-lista sors ta' \"%s\"..."
+msgid "trying to select inexistent medium \"%s\""
+msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "qed jinqraw fajls rpm minn [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"ma nistax naċċessa l-ewwel sors ta' installazzjoni (ma nstabx il-fajl "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ma setgħux jinqraw l-fajls rpm minn [%s]: %s"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "deskrizzjoni tal-hdlist \"%s\" invalida fil-fajl hdlist"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ebda fajls rpm ma nstabu minn [%s]"
+msgid "retrieving hdlists file..."
+msgstr "qed naqra l-fajl \"hdlists\"..."
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "qed nikseb il-fajl ta' deskrizzjoni għal \"%s\"..."
+msgid "copying hdlists file..."
+msgstr "qed nikkopja l-fajl hdlist..."
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
+msgid "unable to access first installation medium"
+msgstr "ma nistax naċċessa l-ewwel sors ta' installazzjoni"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "il-qari tal-hdlist jew sinteżi sors falla."
+#: ../urpm.pm:1
+#, c-format
+msgid "added medium %s"
+msgstr "ġie miżjud is-sors %s"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "sors \"%s\" diġà jeżisti"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fajl [%s] diġà użat fl-istess medjum \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problema fil-qari tal-hdlist għas-sors \"%s\""
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ma nistax nifli l-fajl hdlist ta' \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis ma jistax jintuża ma' --media, --update jew --parallel"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ma nistax nikteb il-fajl tal-lista \"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "ma nistax nuża għażla parallela \"%s\""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
+msgid "using associated media for parallel mode: %s"
+msgstr "qed tintuża medja assoċjata għal modalità parallela: %s"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ma nkiteb xejn fil-lista għal \"%s\""
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "Qed ngħaddi t-tieni passata biex niddetermina dipendenzi\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "instab \"parallel handler\" għal nodi: %s"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
+msgid "examining parallel handler in file [%s]"
+msgstr "qed jiġi eżaminat \"parallel handler\" fil-fajl [%s]"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "qed jinbena hdlist [%s]"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ma nistax nifli \"%s\" fil-fajl [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
+msgid "write config file [%s]"
+msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "instabu %d headers fil-cache"
+msgid "unable to write config file [%s]"
+msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "qed inneħħi %d headers antiki mill-cache"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ma nistax nikseb il-path għal sors li jitneħħa \"%s\""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "qed jiġi mmuntat %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "qed jintuża apparat [%s] għal \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "qed niżmonta %s"
+msgid "taking removable device as \"%s\""
+msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s elementi relokati f' depslist"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "wisq punti ta' mmuntar għas-sors li jitneħħa \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "ebda element relokat f' deplist"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ma nistax jispezzjona l-fajl tal-lista għal \"%s\", sors injorat"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "isem tal-fajl rpm [%s] invalidu"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "fajl tal-lista ta' \"%s\" ma jinftehimx, sors injorat"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "qed jinġabu l-fajls rpm..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ma nistax insib il-fajl tal-lista għal \"%s\", sors injorat."
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ma nistax naċċessa l-fajl rpm [%s]"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ma nistax insib il-fajl hdlist għal \"%s\", sors injorat"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ma nistax naċċessa l-fajl rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "qed nipprova naqbeż is-sors eżistenti \"%s\""
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ma nistax naċċessa l-fajl tal-lista \"%s\", sors injorat"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "ebda pakkett imsejjaħ %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ma nistax naċċessa l-fajl hdlist ta' \"%s\", sors injorat"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Dawn il-pakketti fihom %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ma nistax niddetermina s-sors ta' dan il-fajl hdlist [%s]"
 
-#: ../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\""
-msgstr "hemm diversi pakketti bl-istess isem ta' rpm \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"ma nistax nuża s-sors \"%s\" peress li ma jeżistix fajl ta' lista \"%s\""
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ma nistax nifli sew [%s] fuq il-valur \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "ma nistax nuża l-isem \"%s\" għas-sors għax diġà qed jintuża"
 
-#: ../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)"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"ma nistax nieħu ħsieb is-sors \"%s\" peress li l-fajl tal-lista diġà qed "
+"jintuża minn sors ieħor"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "is-sors \"%s\" jipprova juża lista diġà użata, sors injorat"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "pakkett %s ma nstabx."
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "sors \"%s\" qed jipprova juża hdlist li diġà użat, sors injorat"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "sors \"%s\" mhuwiex magħżul"
+msgid "syntax error in config file at line %s"
+msgstr "żball sintattiku fil-fajl ta' konfigurazzjoni, fuq linja %s"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ma nistax naqra l-rpm [%s] mis-sors \"%s\""
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "sors \"%s\" immarkat li jista' jitneħħa, imma m'hux"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "input iffurmat ħażin [%s]"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync falla: ħareġ b' %d jew sinjal %d\n"
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "qed jinġabu l-fajls rpm..."
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh m'hux installat\n"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Qed nipprepara..."
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync is missing\n"
+msgstr "resync ma jeżistix\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "ma nistax inneħħi l-pakkett %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl falla: ħareġ b' %d jew sinjal %d\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "ma nistax ninstalla l-pakkett %s"
+msgid "curl is missing\n"
+msgstr "curl ma jeżistix\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s huwa meħtieġ minn %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget falla: ħareġ b' %d jew sinjal %d\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s jikkonfliġġi ma' %s"
+msgid "wget is missing\n"
+msgstr "wget m'hux installat\n"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "...ikkupjar falla"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "ma nistax nuża l-protokoll: %s"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "ebda webfetch (curl jew wget bħalissa) ma nstab\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 "Installazzjoni falliet fuq nod %s"
+msgid "unknown protocol defined for %s"
+msgstr "protokoll mhux magħruf definit għal %s"
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-msgid "Installation is possible"
-msgstr "Installazzjoni possibbli"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "\"webfetch\" mhux magħruf `%s' !!!\n"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "Installazzjoni falliet fuq nod %s"
+msgid "Removing failed"
+msgstr "...ikkupjar falla"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpme:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "kompjuter %s m'għandux verżjoni tajba ta' urpmi"
-
-#: ../urpme_.c:39
-#, fuzzy, 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"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"urpmi verżjoni %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
-"GPL.\n"
-"\n"
-"użu:\n"
-
-#: ../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         - uri dan il-messaġġ ta' għajnuna.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - agħżel pakkett awtomatikament fl-għażla.\n"
-
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - ivverifika li l-installazzjoni tista' ssir sew.\n"
+"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - iddistribwixxi urpmi fuq il-magni ta' alias.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
-#: ../urpme_.c:48
-#, fuzzy
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "M'hemm xejn x'inneħħi.\n"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: għażla \"-%s\" mhux magħrufa, iċċekkja l-użu b' --help\n"
+msgid "removing package %s will break your system"
+msgstr "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "pakkett/i mhux magħrufa"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "pakketti mhux magħrufa"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew\n"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: għażla \"-%s\" mhux magħrufa, iċċekkja l-użu b' --help\n"
 
-#: ../urpme_.c:95
-#, fuzzy
-msgid "Nothing to remove"
-msgstr "M'hemm xejn x'inneħħi.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - iddistribwixxi urpmi fuq il-magni ta' alias.\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 ""
-"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - ivverifika li l-installazzjoni tista' ssir sew.\n"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "...ikkupjar falla"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - agħżel pakkett awtomatikament fl-għażla.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - uri dan il-messaġġ ta' għajnuna.\n"
+
+#: ../urpme:1
 #, fuzzy, 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 ""
-"urpmq verżjoni %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmi verżjoni %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
 "GPL.\n"
 "\n"
 "użu:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - uża biss is-sorsi llistjati b'virgoli.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
 
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - modalità b'ħafna dettalji (verbose).\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
+"  -u             - neħħi pakkett jekk diġà hemm verżjoni aħjar installata.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr "  --quiet         - turix l-isem (impliċitu jekk il-kmand ma fihx tag,"
-
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - uri t-tags kollha."
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - uri l-isem: isem tal-fajl rpm (impliċitu jekk ma tingħata"
-
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - uri l-grupp."
-
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - uri d-daqs."
-
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - uri d-daqs."
-
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - uri sommarju"
+"  -u             - neħħi pakkett jekk diġà hemm verżjoni aħjar installata.\n"
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - uri deskrizzjoni"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - naddaf id-direttorju tal-cache tal-headers.\n"
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --provides      - uri \"provides\" - kull ma jipprovdi (diversi linji)"
+"  -f             - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
 
-#: ../urpmf_.c:47
-#, fuzzy
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
-msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ (diversi linji)"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
 
-#: ../urpmf_.c:48
-#, fuzzy
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - uri \"files\": il-files kollha (diversi linji)"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+"  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\" (diversi linji)."
 
-#: ../urpmf_.c:49
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
 "  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 "  --conflicts     - uri \"conflicts\": kull ma joħloq konflitt (diversi "
 "linji)"
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\" (diversi linji)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - uri \"files\": il-files kollha (diversi linji)"
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ (diversi linji)"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  -f             - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
+"  --provides      - uri \"provides\" - kull ma jipprovdi (diversi linji)"
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - naddaf id-direttorju tal-cache tal-headers.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - uri deskrizzjoni"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - uri sommarju"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - uri d-daqs."
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - uri d-daqs."
 
-#: ../urpmf_.c:54
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - uri l-grupp."
+
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -u             - neħħi pakkett jekk diġà hemm verżjoni aħjar installata.\n"
+"  --name          - uri l-isem: isem tal-fajl rpm (impliċitu jekk ma tingħata"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - uri t-tags kollha."
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr "  --quiet         - turix l-isem (impliċitu jekk il-kmand ma fihx tag,"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  -u             - neħħi pakkett jekk diġà hemm verżjoni aħjar installata.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - modalità b'ħafna dettalji (verbose).\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - uża biss is-sorsi llistjati b'virgoli.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"użu: urpmi.addmedia [għażliet] <isem><url> [with <direttorju_relattiv>]\n"
-"fejn <url> huwa wieħed minn:\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <isem tal-hdlist "
-"relattiv>\n"
-"       ftp://<host>/<path> with <isem tal-hdlist relattiv>\n"
-"       http://<host>/<path> with <isem tal-hdlist relattiv>\n"
-"       removable://<path>\n"
+"urpmq verżjoni %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+"GPL.\n"
 "\n"
-"u [għażliet] huma minn\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         - uża wget biex iġġib fajls remoti.\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         - uża curl biex iġġib fajls remoti.\n"
+"użu:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "kollox diġà installat"
 
-#: ../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        - uża l-proxy HTTP speċifikat. In-numru tal-port huwa "
-"meqjus\n"
-"                   li huwa 1080 impliċitament (format huwa <proxyhost[:port]"
-">).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Installazzjoni possibbli"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - speċifika user u password biex tuża għall-"
-"awtentikazzjoni\n"
-"                   tal-proxy (format huwa <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "installazzjoni falliet"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - oħloq sors ta' aġġornament.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
 
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - oħloq is-sorsi kollha minn sors ta' installazzjoni.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "qed jiġi distribwit %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
+"L-installazzjoni falliet, xi fajls huma nieqsa.\n"
+"Forsi trid taġġorna d-database urpmi"
 
-#: ../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"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (i/L) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Trid tkompli l-installazzjoni ?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - naddaf id-direttorju tal-cache tal-headers.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Dawn il-pakketti fihom firem ħżiena"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr "  -h             - ipprova sib u uża l-fajls hdlist jew sinteżi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Agħfas Enter meta tlesti..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"m'hemmx għalfejn tagħti <isem tal-hdlist relattiv> ma' --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ma nistax naġġorna s-sors \"%s\"\n"
+"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
+"d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Trid tkun \"root\" biex tinstalla dawn id-dipendenzi:\n"
 "%s\n"
-"<isem tal-hdlist relattiv> mhux speċifikat\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 ""
+"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
 "%s\n"
-"\"with\" nieqes għal sors ftp\n"
+"Taċċetta?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ma nistax noħloq sors \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "unrequested"
 msgstr ""
-"użu: urpmi.removemedia [-a] <isem> ...\n"
-"fejn <isem> huwa l-isem tas-sors xi tneħħi.\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - agħżel is-sorsi kollha.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "%s jikkonfliġġi ma' %s"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "wget m'hux installat\n"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"\n"
-"għażla \"%s\" mhux magħrufa\n"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "xejn x'inneħħi (uża urpmi.addmedia biex iżżid sors)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "ma nistax ninstalla l-pakkett %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 ""
-"l-element li trid tneħħi m'hux hemm\n"
-"(wieħed minn %s)\n"
+"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
+"%s\n"
+"Taċċetta?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"użu: urpmi.update [għażliet] <isem> ...\n"
-"fejn <isem> huwa l-isem tas-sors x'taġġorna.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Għażla ħażina, jiddispjaċini. Erġa' pprova\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "X'tagħżel? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - agħżel is-sorsi kollha li ma jitneħħewx.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - ġiegħel il-fajl depslist.ordered jiġi kalkulat "
-"kompletament.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Wieħed minn dawn il-pakketti meħtieġa biex tinstalla %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "m'hemm xejn x'naġġorna (uża urpmi.addmedia biex iżżid sors)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
-"l-element li trid taġġorna m'hux hemm\n"
-"(wieħed minn %s)\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 "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"urpmi verżjoni %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
-"GPL.\n"
-"\n"
-"użu:\n"
 
-#: ../urpmi_.c:75
-#, fuzzy
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: għażla \"-%s\" mhux magħrufa, iċċekkja l-użu b' --help\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --auto-select  - agħżel pakketti awtomatikament biex taġġorna s-sistema.\n"
+"  ismijiet jew fajls rpm mogħtija fuq il-linja ta' kmand jiġu nstallati.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - imponi tfittix \"fuzzy\" (l-istess bħal -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modalità b'ħafna dettalji (verbose).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modalità kwieta.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --src          - il-pakkett li jmiss huwa pakkett sors (l-istess bħal -"
-"s).\n"
+"  -s             - il-pakkett li jmiss huwa sors (l-istess bħal --src).\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
+"  -y             - ġiegħel tfittix \"fuzzy\" (l-istess bħal --fuzzy).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - neħħi rpms mill-cache qabel affarijiet oħra.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - tfittixx fil-\"provides\" biex issib pakkett.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - żomm rpms mhux użati fil-cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - ippermetti tfittix fil-\"provides\" biex issib pakkett.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --media        - uża biss is-sorsi llistjati b'virgoli.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force        - imponi l-invokazzjoni anke jekk xi pakketti ma jeżistux.\n"
+"  --verify-rpm   - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
+"                   (--no-verify-rpm itfih, impliċitament mixgħul).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - ippermetti li l-user jiġi mistoqsi jekk iridx jinstalla\n"
-"                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi.\n"
+"  --best-output  - agħżel l-aħjar interfaċċja skond l-ambjent, X jew "
+"testwali.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - uża l-interfaċċja X.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --allow-force  - jippermetti li l-user jiġi mistoqsi jridx jinstalla \n"
-"                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi \n"
-"                   u integrità.\n"
+"  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1161,456 +1270,475 @@ msgstr ""
 "  --bug          - ipproduċi rapport ta' bug fid-direttorju indikat "
 "fl-                   argument li jmiss.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - uża l-interfaċċja X.\n"
+"  --proxy-user   - speċifika user u password biex tuża għall-"
+"awtentikazzjoni\n"
+"                   tal-proxy (format huwa <user:password>).\n"
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --best-output  - agħżel l-aħjar interfaċċja skond l-ambjent, X jew "
-"testwali.\n"
+"  --proxy        - uża l-proxy HTTP speċifikat. In-numru tal-port huwa "
+"meqjus\n"
+"                   li huwa 1080 impliċitament (format huwa <proxyhost[:port]"
+">).\n"
 
-#: ../urpmi_.c:103
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
-"  --verify-rpm   - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
-"                   (--no-verify-rpm itfih, impliċitament mixgħul).\n"
-
-#: ../urpmi_.c:106
-#, fuzzy
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --media        - uża biss is-sorsi llistjati b'virgoli.\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - ippermetti tfittix fil-\"provides\" biex issib pakkett.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - uża curl biex iġġib fajls remoti.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - tfittixx fil-\"provides\" biex issib pakkett.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - uża wget biex iġġib fajls remoti.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -y             - ġiegħel tfittix \"fuzzy\" (l-istess bħal --fuzzy).\n"
+"  --allow-force  - jippermetti li l-user jiġi mistoqsi jridx jinstalla \n"
+"                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi \n"
+"                   u integrità.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -s             - il-pakkett li jmiss huwa sors (l-istess bħal --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modalità kwieta.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modalità b'ħafna dettalji (verbose).\n"
+"  --allow-nodeps - ippermetti li l-user jiġi mistoqsi jekk iridx jinstalla\n"
+"                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi.\n"
 
-#: ../urpmi_.c:114
-#, fuzzy
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"  ismijiet jew fajls rpm mogħtija fuq il-linja ta' kmand jiġu nstallati.\n"
+"  --force        - imponi l-invokazzjoni anke jekk xi pakketti ma jeżistux.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: għażla \"-%s\" mhux magħrufa, iċċekkja l-użu b' --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - żomm rpms mhux użati fil-cache.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - neħħi rpms mill-cache qabel affarijiet oħra.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
-
-#: ../urpmi_.c:349
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Wieħed minn dawn il-pakketti meħtieġa biex tinstalla %s:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - il-pakkett li jmiss huwa pakkett sors (l-istess bħal -"
+"s).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "X'tagħżel? (1-%d) "
-
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Għażla ħażina, jiddispjaċini. Erġa' pprova\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - imponi tfittix \"fuzzy\" (l-istess bħal -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
-"%s\n"
-"Taċċetta?"
+"  --auto-select  - agħżel pakketti awtomatikament biex taġġorna s-sistema.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "ma nistax ninstalla l-pakkett %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
+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 verżjoni %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+"GPL.\n"
+"\n"
+"użu:\n"
 
-#: ../urpmi_.c:409
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget m'hux installat\n"
-
-#: ../urpmi_.c:414
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s jikkonfliġġi ma' %s"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "ma nistax naġġorna s-sors \"%s\"\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ma nistax noħloq sors \"%s\"\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 ""
-"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
 "%s\n"
-"Taċċetta?"
+"\"with\" nieqes għal sors ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
-"d MB)"
+"%s\n"
+"<isem tal-hdlist relattiv> mhux speċifikat\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 ""
-"Trid tkun \"root\" biex tinstalla dawn id-dipendenzi:\n"
 "%s\n"
+"m'hemmx għalfejn tagħti <isem tal-hdlist relattiv> ma' --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "qed jinġabu l-fajls rpm..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"għażla \"%s\" mhux magħrufa\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
 
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Agħfas Enter meta tlesti..."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr "  -h             - ipprova sib u uża l-fajls hdlist jew sinteżi.\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Dawn il-pakketti fihom firem ħżiena"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - naddaf id-direttorju tal-cache tal-headers.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Trid tkompli l-installazzjoni ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (i/L) "
+#: ../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 ""
 
-#: ../urpmi_.c:548
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"L-installazzjoni falliet, xi fajls huma nieqsa.\n"
-"Forsi trid taġġorna d-database urpmi"
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "installazzjoni falliet"
+"  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "qed jiġi distribwit %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
+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 ""
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - oħloq is-sorsi kollha minn sors ta' installazzjoni.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "kollox diġà installat"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - oħloq sors ta' aġġornament.\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 verżjoni %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
-"GPL.\n"
+"użu: urpmi.addmedia [għażliet] <isem><url> [with <direttorju_relattiv>]\n"
+"fejn <url> huwa wieħed minn:\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <isem tal-hdlist "
+"relattiv>\n"
+"       ftp://<host>/<path> with <isem tal-hdlist relattiv>\n"
+"       http://<host>/<path> with <isem tal-hdlist relattiv>\n"
+"       removable://<path>\n"
 "\n"
-"użu:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
+"u [għażliet] huma minn\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - illistja l-medji disponibbli.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"l-element li trid tneħħi m'hux hemm\n"
+"(wieħed minn %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - illistja nodi disponibbli għal --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "xejn x'inneħħi (uża urpmi.addmedia biex iżżid sors)\n"
 
-#: ../urpmq_.c:49
-#, fuzzy
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-media   - illistja l-medji disponibbli.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - agħżel is-sorsi kollha.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - oħroġ il-headers għall-pakkett imsemmi mid-db urpmi\n"
-"                   għal stdout (root biss).\n"
+"użu: urpmi.removemedia [-a] <isem> ...\n"
+"fejn <isem> huwa l-isem tas-sors xi tneħħi.\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      - agħti l-pakketti sorsi kollha qabel tniżżilhom (root "
-"biss).\n"
+"l-element li trid taġġorna m'hux hemm\n"
+"(wieħed minn %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - estendi t-tfittix għad-dipendenzi tal-pakketti.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "m'hemm xejn x'naġġorna (uża urpmi.addmedia biex iżżid sors)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - neħħi pakkett jekk diġà hemm verżjoni iżjed riċenti "
-"nstallata.\n"
+"  -d             - ġiegħel il-fajl depslist.ordered jiġi kalkulat "
+"kompletament.\n"
 
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    ebda tag fil-kmand, iżda minngħajr pakkett)"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - agħżel is-sorsi kollha li ma jitneħħewx.\n"
 
-#: ../urpmq_.c:67
-#, fuzzy
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  -p             - ippermetti tfittix fil-\"provides\" biex issib pakkett.\n"
+"użu: urpmi.update [għażliet] <isem> ...\n"
+"fejn <isem> huwa l-isem tas-sors x'taġġorna.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - uri l-gruppi flimkien ma' l-isem.\n"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--synthesis ma jistax jintuża ma' --media, --update jew --parallel"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - uri verżjoni u ħarġa flimkien ma' l-isem.\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: għażla \"-%s\", mhux magħrufa, iċċekkja l-użu b' --help\n"
+
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  ismijiet jew fajls rpm li jingħataw fuq il-linja tal-kmand jiġu "
 "spezzjonati.\n"
 
-#: ../urpmq_.c:174
-#, fuzzy
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--synthesis ma jistax jintuża ma' --media, --update jew --parallel"
-
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf verżjoni %s"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - uri verżjoni u ħarġa flimkien ma' l-isem.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - uri l-gruppi flimkien ma' l-isem.\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU GPL."
+"  -p             - ippermetti tfittix fil-\"provides\" biex issib pakkett.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "użu: urpmf [għażliet] <fajl>"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    ebda tag fil-kmand, iżda minngħajr pakkett)"
 
-#: placeholder.h:22
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr "  --quiet         - turix l-isem (impliċitu jekk il-kmand ma fihx tag,"
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    inkompatibbli mal-modalità interattiv)."
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - neħħi pakkett jekk diġà hemm verżjoni iżjed riċenti "
+"nstallata.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - uri t-tags kollha."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - estendi t-tfittix għad-dipendenzi tal-pakketti.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --name          - uri l-isem: isem tal-fajl rpm (impliċitu jekk ma tingħata"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    ebda tag fil-kmand, iżda minngħajr pakkett)"
+"  --sources      - agħti l-pakketti sorsi kollha qabel tniżżilhom (root "
+"biss).\n"
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - uri l-grupp."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - oħroġ il-headers għall-pakkett imsemmi mid-db urpmi\n"
+"                   għal stdout (root biss).\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - uri d-daqs."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-media   - illistja l-medji disponibbli.\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - uri n-numru tas-serje"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - illistja nodi disponibbli għal --parallel.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - uri sommarju"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - illistja l-medji disponibbli.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - uri deskrizzjoni"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
-"  --provides      - uri \"provides\" - kull ma jipprovdi (diversi linji)"
-
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ (diversi linji)"
+"urpmq verżjoni %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+"GPL.\n"
+"\n"
+"użu:\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - uri \"files\": il-files kollha (diversi linji)"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Installazzjoni falliet fuq nod %s"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
-"  --conflicts     - uri \"conflicts\": kull ma joħloq konflitt (diversi "
-"linji)"
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
-"  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\" (diversi linji)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - ipprintja l-prirekwiżiti (diversi linji)"
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "ipprova urpmf --help għal iżjed għażliet"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "ma nstabet ebda lista sħiħa ta' sorsi"
-
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl falla: ħareġ b' %d jew sinjal %d\n"
-
-#~ msgid "rsync is missing\n"
-#~ msgstr "resync ma jeżistix\n"
-
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync falla: ħareġ b' %d jew sinjal %d\n"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh m'hux installat\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "żball sintattiku fil-fajl ta' konfigurazzjoni, fuq linja %s"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "Installazzjoni falliet fuq nod %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr "sors \"%s\" qed jipprova juża hdlist li diġà użat, sors injorat"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "kompjuter %s m'għandux verżjoni tajba ta' urpmi"
 
 #~ msgid "Remove them all?"
 #~ msgstr "Trid tneħħihom kollha?"
@@ -1636,12 +1764,6 @@ msgstr "ma nstabet ebda lista sħiħa ta' sorsi"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - ipprintja dan il-messaġġ ta' għajnuna.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: għażla \"-%s\", mhux magħrufa, iċċekkja l-użu b' --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr "ma nistax nibni l-fajl ta' sinteżi għas-sors \"%s\""
 
@@ -1725,9 +1847,6 @@ msgstr "ma nstabet ebda lista sħiħa ta' sorsi"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr ""
 #~ "użu: urpmi.addmedia [għażliet] <isem> <url> [with <direttorju_relattiv>]"
diff --git a/po/nl.po b/po/nl.po
index 09449e53..1ee5e7bd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2003-03-05 19:38+0100\n"
+"POT-Creation-Date: 2003-03-05 21:19+0100\n"
 "PO-Revision-Date: 30/01/03 23:50\n"
 "Last-Translator: Peter Bosch <peter@dromas.student.utwente.nl>\n"
 "Language-Team: Nederlands <vertaling@nl.linux.org>\n"
@@ -19,1174 +19,1294 @@ 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 "bezig met installeren van %s\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
+#. 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 "YyJj"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versie %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Automatische installatie van pakketten...\n"
-"U vroeg de installatie van pakket %s aan\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Is dit goed?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "gebruikaanwijzing: urpmf [optie] <bestand>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - geeft de tag-naam niet weer (standaard als er geen tag "
+"wordt meegegeven"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Annuleren"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    line, gaat niet samen met de interactieve modus)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - geeft alle tags weer."
 
-#  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
-#: ../_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 "YyJj"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - geeft de tag-naam weer: rpm bestandsnaam (als er geen "
+"tag mee is gegeven"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    opdrachtregel zonder pakketnaam)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - geeft de tag-groep weer: groep."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - geeft de tag-grootte weer: grootte."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - geeft de tag serienr: serienr."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - geeft de tag samenvatting: samenvatting."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - geeft de tag omschrijving: omschrijving."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - geeft de tag levert: alle 'provides' (meerdere regels)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - geeft de tag vereisten: alle 'requires' (meerdere "
+"regels)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - geeft de tag bestanden: alle bestanden (meerdere regels)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - geeft de tag conflicten: alle conflicten (meerdere "
+"regels)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - geeft de tag \"verouderd\": alle 'obsoletes' (meerdere "
+"regels)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - geeft de tag benodigdheden: alle 'prereqs' (meerdere "
+"regels)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "probeer urpmf --help voor meer opties"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "geen volledige medialijst gevonden"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: opdracht niet gevonden\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Onbekende webfetch `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "onbekend protocol gedefinieerd voor %s"
+msgid "Cancel"
+msgstr "Annuleren"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "geen webfetch (curl of wget) gevonden\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "kon volgend protocol niet verwerken: %s"
+msgid "Is this OK?"
+msgstr "Is dit goed?"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automatische installatie van pakketten...\n"
+"U vroeg de installatie van pakket %s aan\n"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "bezig met installeren van %s\n"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...kopiëren is mislukt"
+msgid "unable to open rpmdb"
+msgstr "kon rpm-bestand niet registreren"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget is niet geïnstalleerd\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "kon rpm-bestand [%s] niet benaderen"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget is mislukt: afgesloten met %d of signaal %d\n"
+msgid "%s conflicts with %s"
+msgstr "%s conflicteert met %s"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl is niet geïnstalleerd\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr "%s is nodig voor %s"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"medium \"%s\" probeert een al gebruikte lijst te gebruiken, medium genegeerd"
+msgid "unable to install package %s"
+msgstr "kon volgend pakket niet installeren: %s"
 
-#: ../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 ""
-"kon medium \"%s\" niet verzorgen, omdat het list bestand al in gebruik is "
-"door een ander medium"
+msgid "unable to remove package %s"
+msgstr "kon pakket %s niet verwijderen"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"kon naam \"%s\" niet gebruiken voor naamloos medium omdat deze al in gebruik "
-"is"
+msgid "Preparing..."
+msgstr "Bezig met voorbereiden..."
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"kon het medium \"%s\" niet in de account opnemen, omdat lijstbestand [%s] "
-"niet bestaat"
+msgid "...retrieving failed: %s"
+msgstr "...ontvangen mislukt: %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kon medium van dit hdlist bestand niet vaststellen [%s]"
+msgid "...retrieving done"
+msgstr "...ontvangen is klaar"
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kon hdlist bestand \"%s\" niet benaderen, medium genegeerd"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "kon list bestand van \"%s\" niet benaderen, medium genegeerd"
+msgid "malformed input: [%s]"
+msgstr "ongeldige invoer [%s]"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "bezig met proberen medium \"%s\" te omzeilen, bezig met mijden"
+msgid "unable to access medium \"%s\""
+msgstr "kon medium \"%s\" niet benaderen"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kon hdlist bestand voor \"%s\" niet vinden, medium genegeerd"
+msgid "urpmi database locked"
+msgstr "urpmi database geblokkeerd"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kon het lijstbestand voor \"%s\" niet vinden, medium genegeerd"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"onsamenhangend medium \"%s\" als verwisselbaar gemarkeerd, maar is dit niet"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "onsamenhangend lijst-bestand voor \"%s\", medium genegeerd"
+msgid "medium \"%s\" is not selected"
+msgstr "medium \"%s\" is niet geselecteerd"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kon list bestaand voor \"%s\" niet inspecteren, medium genegeerd"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kon rpm bestand [%s] niet lezen van medium \"%s\""
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "teveel koppelpunten (mount) voor verwisselbaar medium \"%s\""
+msgid "package %s is not found."
+msgstr "pakket %s is niet gevonden."
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "gebruikt verwisselbaar apparaat als \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "medium \"%s\" bevat geen locatie voor rpm bestanden"
 
-#: ../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 ""
-"bezig met een andere verwisselbare schijf [%s] te gebruiken voor \"%s\""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kon de padnaam van verwisselbaar medium \"%s\" niet vinden"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "er zijn meerdere pakketten met dezelfde rpm bestandsnaam \"%s\""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "kon configuratiebestand [%s] niet wegschrijven"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "kon [%s] niet correct verwerken op waarde \"%s\""
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "config-bestand [%s] wegschrijven"
+msgid "The following packages contain %s: %s"
+msgstr "De volgende pakketten bevatten %s: %s"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "niet in staat \"%s\" te interpreteren in bestand [%s]"
+msgid "no package named %s"
+msgstr "geen pakket genaamd %s"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "bezig met onderzoeken parallelle handler in bestand [%s]"
+msgid "error registering local packages"
+msgstr "registreren van lokale pakketten is mislukt"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "kon rpm-bestand [%s] niet benaderen"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "parallelle handler gevonden voor knooppunten: %s"
+msgid "retrieving rpm file [%s] ..."
+msgstr "bezig met ontvangen van rpm bestand [%s] ..."
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "geassocieerde media worden voor parallelle modus gebruikt: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "ongeldige rpm-bestandsnaam [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "niet in staat parallelle optie \"%s\" te gebruiken"
+msgid "no entries relocated in depslist"
+msgstr "geen ingangen van plaats veranderd in depslist"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr ""
-"--synthesis kan niet gebruikt worden met --media, --update of --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "%s van plaats veranderde ingangen in depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "bezig met afkoppelen van %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "bezig met aankoppelen van %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "bezig met het verwijderen van %d verouderde titels in de cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "%d headers in cache gevonden"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "hdlist synthesis bestand opgebouwd voor medium \"%s\""
 
-#: ../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]"
 msgstr "bezig met onderzoeken hdlist bestand [%s]"
 
-#: ../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]"
 msgstr "bezig met onderzoeken van het synthesis bestand [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "probleem met lezen van synthesis bestand (hdlist) van medium \"%s\""
+msgid "building hdlist [%s]"
+msgstr "bezig met bouwen hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "bezig met lezen van headers van medium \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "uitvoeren tweede fase, controleren van afhankelijkheden\n"
 
-#: ../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\""
 msgstr "probleem met lezen van synthesis bestand van medium \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "kon rpm-bestand niet registreren"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medium \"%s\" bestaat al"
+msgid "nothing written in list file for \"%s\""
+msgstr "er is niets geschreven in het lijstbestand voor \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "toegevoegd medium %s"
+msgid "writing list file for medium \"%s\""
+msgstr "bezig met schrijven van lijstbestand voor medium \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "kon het eerste installatie medium niet vinden"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "kon lijstbestand van \"%s\" niet schrijven"
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "bezig met kopiëren hdlist bestanden"
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "bestand [%s] reeds gebruik in hetzelfde medium \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kopiëren is klaar"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "het hdlist-bestand van \"%s\" is ongeldig"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kopiëren is klaar"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "geen hdlist-bestand gevonden voor medium \"%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)"
-msgstr ""
-"kon het eerste installatie medium niet vinden (geen Mandrake/base/hdlists "
-"bestanden gevonden)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "ontvangen van bron hdlist (of synthesis) is mislukt"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "bezig met ontvangen van hdlists bestand..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "bezig met onderzoeken MD5SUM bestand"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...ontvangen is klaar"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "bezig met kopiëren bron hdlist (of synthesis) van \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ontvangen mislukt: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "bezig met bron hdlist (of synthesis) van \"%s\" te ontvangen..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "ongeldige hdlist omschrijving \"%s\" in hdlists bestand"
+msgid "retrieving description file of \"%s\"..."
+msgstr "bezig met ontvangen van een omschrijving van \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "probeert een onbestaand medium \"%s\" te selecteren"
+msgid "no rpm files found from [%s]"
+msgstr "geen rpm bestanden gevonden van [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "kon rpm-bestanden niet lezen van [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "bezig meerdere media te selecteren: %s"
+msgid "reading rpm files from [%s]"
+msgstr "bezig met lezen van rpm-bestanden van [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "bezig met verwijderen van medium \"%s\""
+msgid "...copying done"
+msgstr "...kopiëren is klaar"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi database geblokkeerd"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...kopiëren is klaar"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kon medium \"%s\" niet benaderen"
+msgid "copying source list of \"%s\"..."
+msgstr "bezig met kopieren van bron lijst van \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "kopiëren van [%s] mislukt"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "bezig met kopiëren bron hdlist (of synthesis) van \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "kopiëren van [%s] mislukt"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "bezig met onderzoeken MD5SUM bestand"
+msgid "copying description file of \"%s\"..."
+msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "bezig met kopieren van bron lijst van \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "bezig met verwijderen van medium \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "bezig met lezen van rpm-bestanden van [%s]"
+msgid "selecting multiple media: %s"
+msgstr "bezig meerdere media te selecteren: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "kon rpm-bestanden niet lezen van [%s]: %s"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "geen rpm bestanden gevonden van [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "probeert een onbestaand medium \"%s\" te selecteren"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "bezig met ontvangen van een omschrijving van \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"kon het eerste installatie medium niet vinden (geen Mandrake/base/hdlists "
+"bestanden gevonden)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "bezig met bron hdlist (of synthesis) van \"%s\" te ontvangen..."
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "ontvangen van bron hdlist (of synthesis) is mislukt"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "ongeldige hdlist omschrijving \"%s\" in hdlists bestand"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "geen hdlist-bestand gevonden voor medium \"%s\""
+msgid "retrieving hdlists file..."
+msgstr "bezig met ontvangen van hdlists bestand..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "bestand [%s] reeds gebruik in hetzelfde medium \"%s\""
+msgid "copying hdlists file..."
+msgstr "bezig met kopiëren hdlist bestanden"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "het hdlist-bestand van \"%s\" is ongeldig"
+msgid "unable to access first installation medium"
+msgstr "kon het eerste installatie medium niet vinden"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "kon lijstbestand van \"%s\" niet schrijven"
+msgid "added medium %s"
+msgstr "toegevoegd medium %s"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "bezig met schrijven van lijstbestand voor medium \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "medium \"%s\" bestaat al"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "er is niets geschreven in het lijstbestand voor \"%s\""
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "uitvoeren tweede fase, controleren van afhankelijkheden\n"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "probleem met lezen van synthesis bestand (hdlist) van medium \"%s\""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "bezig met lezen van headers van medium \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
+"--synthesis kan niet gebruikt worden met --media, --update of --parallel"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "bezig met bouwen hdlist [%s]"
+msgid "unable to use parallel option \"%s\""
+msgstr "niet in staat parallelle optie \"%s\" te gebruiken"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "hdlist synthesis bestand opgebouwd voor medium \"%s\""
+msgid "using associated media for parallel mode: %s"
+msgstr "geassocieerde media worden voor parallelle modus gebruikt: %s"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d headers in cache gevonden"
+msgid "found parallel handler for nodes: %s"
+msgstr "parallelle handler gevonden voor knooppunten: %s"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "bezig met het verwijderen van %d verouderde titels in de cache"
+msgid "examining parallel handler in file [%s]"
+msgstr "bezig met onderzoeken parallelle handler in bestand [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "bezig met aankoppelen van %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "niet in staat \"%s\" te interpreteren in bestand [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "bezig met afkoppelen van %s"
+msgid "write config file [%s]"
+msgstr "config-bestand [%s] wegschrijven"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s van plaats veranderde ingangen in depslist"
+msgid "unable to write config file [%s]"
+msgstr "kon configuratiebestand [%s] niet wegschrijven"
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "geen ingangen van plaats veranderd in depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kon de padnaam van verwisselbaar medium \"%s\" niet vinden"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "ongeldige rpm-bestandsnaam [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+"bezig met een andere verwisselbare schijf [%s] te gebruiken voor \"%s\""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "bezig met ontvangen van rpm bestand [%s] ..."
+msgid "taking removable device as \"%s\""
+msgstr "gebruikt verwisselbaar apparaat als \"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "kon rpm-bestand [%s] niet benaderen"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "teveel koppelpunten (mount) voor verwisselbaar medium \"%s\""
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "kon rpm-bestand [%s] niet benaderen"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kon list bestaand voor \"%s\" niet inspecteren, medium genegeerd"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "registreren van lokale pakketten is mislukt"
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "onsamenhangend lijst-bestand voor \"%s\", medium genegeerd"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "geen pakket genaamd %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kon het lijstbestand voor \"%s\" niet vinden, medium genegeerd"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "De volgende pakketten bevatten %s: %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kon hdlist bestand voor \"%s\" niet vinden, medium genegeerd"
 
-#: ../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\""
-msgstr "er zijn meerdere pakketten met dezelfde rpm bestandsnaam \"%s\""
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "bezig met proberen medium \"%s\" te omzeilen, bezig met mijden"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "kon [%s] niet correct verwerken op waarde \"%s\""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "kon list bestand van \"%s\" niet benaderen, medium genegeerd"
 
-#: ../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)"
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kon hdlist bestand \"%s\" niet benaderen, medium genegeerd"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "medium \"%s\" bevat geen locatie voor rpm bestanden"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kon medium van dit hdlist bestand niet vaststellen [%s]"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "pakket %s is niet gevonden."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"kon het medium \"%s\" niet in de account opnemen, omdat lijstbestand [%s] "
+"niet bestaat"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medium \"%s\" is niet geselecteerd"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"kon naam \"%s\" niet gebruiken voor naamloos medium omdat deze al in gebruik "
+"is"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kon rpm bestand [%s] niet lezen van medium \"%s\""
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"kon medium \"%s\" niet verzorgen, omdat het list bestand al in gebruik is "
+"door een ander medium"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"onsamenhangend medium \"%s\" als verwisselbaar gemarkeerd, maar is dit niet"
+"medium \"%s\" probeert een al gebruikte lijst te gebruiken, medium genegeerd"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "ongeldige invoer [%s]"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"medium \"%s\" probeert een hdlist te gebruiken die al wordt gebruikt, medium "
+"genegeerd"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
+msgid "syntax error in config file at line %s"
+msgstr "syntax fout in configuratie bestand op regel %s"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Bezig met voorbereiden..."
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% voltooid, snelheid = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "kon pakket %s niet verwijderen"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% van %s voltooid, ETA = %s, snelheid = %s"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "kon volgend pakket niet installeren: %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync is mislukt: beeindigd met %d of signaal %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s is nodig voor %s"
+msgid "ssh is missing\n"
+msgstr "wget is niet geïnstalleerd\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s conflicteert met %s"
+msgid "rsync is missing\n"
+msgstr "rsync is niet geïnstalleerd\n"
 
-#: ../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 is mislukt, misschien is een knooppunt onbereikbaar"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl is mislukt: afgesloten met %d of signaal %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 is mislukt, misschien is een knooppunt onbereikbaar"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl is niet geïnstalleerd\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "op knooppunt %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget is mislukt: afgesloten met %d of signaal %d\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 "Installatie mislukt op knooppunt %s"
+msgid "wget is missing\n"
+msgstr "wget is niet geïnstalleerd\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 "Installatie is mogelijk"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "...kopiëren is mislukt"
 
-#: ../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 faalde op host %s"
+msgid "unable to handle protocol: %s"
+msgstr "kon volgend protocol niet verwerken: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "host %s heeft niet de goede versie van urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "geen webfetch (curl of wget) gevonden\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 versie %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dit is vrije software en mag worden verspreid onder te voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik:\n"
+msgid "unknown protocol defined for %s"
+msgstr "onbekend protocol gedefinieerd voor %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         - geeft deze helptekst.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Onbekende webfetch `%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - selecteer automatisch een pakket uit de keuzes.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Verwijderen is mislukt"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - verifiëren of de installatie correct uitgevoerd kan "
-"worden.\n"
+"Om aan de afhankelijkheden te voldoen worden de volgende pakketten ook "
+"geïnstalleerd (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - gedistribueerde urpmi over computers van alias.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Aanvinken om de volgende pakketten te verwijderen"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - selecteer alle pakketten die overeenkomen met de "
-"expressie.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Niets te verwijderen"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: onbekende optie \"-%s\", bekijk voor gebruik --help\n"
+msgid "removing package %s will break your system"
+msgstr "het verwijderen van %s zal uw systeem verstoren"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "onbekend pakket"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "onbekende pakketten"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "het verwijderen van %s zal uw systeem verstoren"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: onbekende optie \"-%s\", bekijk voor gebruik --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Niets te verwijderen"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selecteer alle pakketten die overeenkomen met de "
+"expressie.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Aanvinken om de volgende pakketten te verwijderen"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - gedistribueerde urpmi over computers van alias.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Om aan de afhankelijkheden te voldoen worden de volgende pakketten ook "
-"geïnstalleerd (%d MB)"
+"  --test         - verifiëren of de installatie correct uitgevoerd kan "
+"worden.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Verwijderen is mislukt"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - selecteer automatisch een pakket uit de keuzes.\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         - geeft deze helptekst.\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 versie %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"urpme versie %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dit is vrije software en mag worden verspreid onder te voorwaarden van de "
 "GNU GPL.\n"
 "\n"
 "gebruik:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - gebruik alleen bijwerkmedia.\n"
-
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - gebruik alleen de media gescheiden door komma's.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"Terugbellen is :\n"
+"%s\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
+"  )              - rechter parenthesis om groep expressie te sluiten.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 'gebruik veel woorden' modus.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - linker parenthesis om groep expressie te openen.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - unary NOT, waar als expressie onwaar is.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - geeft de tag-naam niet weer (standaard als er geen tag "
-"wordt meegegeven\n"
-"                   lijn, niet compatible met interactieve mode).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - geeft alle tags weer.\n"
+"  -o             - binaire OR operator, waar als een expressie waar is.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - geeft de tag-naam weer: rpm bestandsnaam (als er geen\n"
-"                   tag is meegegeven op opdrachtregel en zonder "
-"pakketnaam).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - geeft de tag-groep weer: groep.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - geeft de tag-grootte weer: grootte.\n"
+"  -a             - binaire AND operator, waar als beide expressies waar "
+"zijn.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - geeft de tag epoch weer: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - voeg perl code direct als perl -e toe.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - geeft de tag samenvatting: samenvatting.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - geeft de versie, uitgave and arch met naam.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - geeft de tag omschrijving: omschrijving.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - onderscheid hoofd-/kleine letters in elk patroon "
+"negeren.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - geeft de tag levert: alle 'levert's (meerdere regels).\n"
+"  --obsoletes     - geeft de tag \"verouderd\": alle "
+"'obsoletes' (meerdere                    regels).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - geeft de tag vereisten: alle 'requires' (meerdere "
+"  --conflicts     - geeft de tag conflicten: alle conflicten (meerdere "
 "regels).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 "  --files         - geeft de tag bestanden: alle bestanden (meerdere "
 "regels).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - geeft de tag conflicten: alle conflicten (meerdere "
+"  --requires      - geeft de tag vereisten: alle 'requires' (meerdere "
 "regels).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - geeft de tag \"verouderd\": alle "
-"'obsoletes' (meerdere                    regels).\n"
+"  --provides      - geeft de tag levert: alle 'levert's (meerdere regels).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - onderscheid hoofd-/kleine letters in elk patroon "
-"negeren.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - geeft de tag omschrijving: omschrijving.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - geeft de versie, uitgave and arch met naam.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - geeft de tag samenvatting: samenvatting.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - voeg perl code direct als perl -e toe.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - geeft de tag epoch weer: epoch.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - geeft de tag-grootte weer: grootte.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - geeft de tag-groep weer: groep.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - binaire AND operator, waar als beide expressies waar "
-"zijn.\n"
+"  --name          - geeft de tag-naam weer: rpm bestandsnaam (als er geen\n"
+"                   tag is meegegeven op opdrachtregel en zonder "
+"pakketnaam).\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - geeft alle tags weer.\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - binaire OR operator, waar als een expressie waar is.\n"
-
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - unary NOT, waar als expressie onwaar is.\n"
+"  --quiet         - geeft de tag-naam niet weer (standaard als er geen tag "
+"wordt meegegeven\n"
+"                   lijn, niet compatible met interactieve mode).\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - linker parenthesis om groep expressie te openen.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 'gebruik veel woorden' modus.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  )              - rechter parenthesis om groep expressie te sluiten.\n"
+"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - gebruik alleen de media gescheiden door komma's.\n"
+
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"Terugbellen is :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - gebruik alleen bijwerkmedia.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"gebruik: urpmi.addmedia [opties] <naam> <url> [with <bijbehorend_pad>]\n"
-"waar <url> één van de volgende is:\n"
-"       file://<pad>\n"
-"       ftp://<gebruikersnaam>:<wachtwoord>@<host>/<pad> with <relatieve "
-"bestandsnaam van hdlist>\n"
-"       ftp://<host>/<pad> with <relatieve bestandsnaam van hdlist>\n"
-"       http://<host>/<pad> with <relatieve bestandsnaam van hdlist>\n"
-"       removable://<pad>\n"
+"urpmf versie %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL.\n"
 "\n"
-"en [opties] kunnen zijn:\n"
+"gebruik:\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         - gebruik wget om bestanden op afstand te ontvangen.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "alles is al geïnstalleerd"
 
-#: ../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         - gebruik curl om bestanden op afstand te ontvangen.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Installatie is mogelijk"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limiteer de download snelheid.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installatie mislukt"
 
-#: ../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        - gebruik specifieke HTTP proxy, het standaard poort "
-"nummer\n"
-"                    is 1080 (formaat is <proxyhost[:poort]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Installatie forceren (--force)? (j/N) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
-"  --proxy-user   - specificeer gebruikersnaam en wachtwoord voor gebruik van "
-"proxy\n"
-"                   authenticatie (formaat is <gebruiker:wachtwoord>).\n"
+"Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - maak een bijwerkmedium aan.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "bezig met distribueren van %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --distrib      - maakt automatisch alle media van een installatie medium\n"
-"                    aan.\n"
+"Installatie is mislukt, sommige bestanden missen:\n"
+"%s\n"
+"Misschien moet u de urpmi database opwaarderen"
 
-#: ../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  - maak automatisch een medium aan voor het XXX gedeelte "
-"van\n"
-"                   een distributie, XXX kan main, contrib, updates (of iets "
-"anders dat\n"
-"                   geconfigureerd is) zijn.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - gebruik aangegeven url voor lijst van mirrors, de "
-"standaard\n"
-"                   is %s\n"
+msgid "Do you want to continue installation ?"
+msgstr "Wilt u doorgaan met de installatie ?"
 
-#: ../urpmi.addmedia_.c:69
-#, fuzzy
-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      - gebruik aangegeven versie, standaard is de versie\n"
-"                   van het pakket geïnstalleerd van een mandrake-uitgave.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "De volgende pakketten bevatten een onjuiste handtekening"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - gebruik aangegeven architectuur, standaard is de versie\n"
-"                   van het pakket geïnstalleerd van een mandrake-uitgave.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Druk op Enter wanneer u klaar bent..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - buffermap headers wissen.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Gelieve het medium genaamd \"%s\" in apparaat [%s] te plaatsen"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "kon bron pakketten niet ontvangen, bezig met afbreken"
 
-#: ../urpmi.addmedia_.c:75
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"  -h             - probeer synthesis of hdlist bestand te\n"
-"                   vinden.\n"
-
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forceer aanmaak van hdlist bestanden.\n"
-
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "kan geen updates van een cooker distributie toevoegen\n"
+"Om aan de afhankelijkheden te voldoen worden de volgende pakketten ook "
+"geïnstalleerd (%d MB)"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"U moet root zijn om de volgende afhankelijkheden te installeren:\n"
 "%s\n"
-"niet nodig om <bijbehorend pad van hdlist> te geven met --distrib"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kon medium \"%s\" niet bijwerken\n"
-
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"De volgende pakketten moeten worden verwijderd om andere te kunnen "
+"opwaarderen:\n"
 "%s\n"
-"<bijbehorend pad van hdlist> ontbreekt\n"
+"Is dit goed?"
+
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr "ongevraagd"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "vanwege conflicten met %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "vanwege missende %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "vanwege onvoldane %s"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "in volgorde om te installeren %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"Bepaalde gevraagde pakketen konden niet worden geïnstalleerd:\n"
 "%s\n"
-"`with' ontbreekt voor ftp media\n"
+"Is dit goed?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kon medium \"%s\" niet maken\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"gebruik: urpmi.removemedia [-a] <naam> ...\n"
-"waar <naam> is een medium naam die verwijderd moet worden.\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sorry, foutieve keuze, probeer een andere\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selecteer alle media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Wat is uw keuze? (1-%d)"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"onbekende opties '%s'\n"
+msgid "One of the following packages is needed:"
+msgstr "Eén van de volgende pakketten is benodigd:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "niets te verwijderen (gebruik urpmi.addmedia om media toe te voegen)\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Eén van de volgende pakketten is benodigd om te installeren: %s:"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"de invoer om te verwijderen ontbreekt\n"
-"(een van %s)\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "Alleen de superuser (root) kan pakketten installeren"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"gebruik: urpmi.update [opties] <naam> ...\n"
-"waar <naam> is een medium naam die bijgewerkt moet worden.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "maakt gebruik van aangegeven omgeving op %s\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - vernieuw alleen bijwerkmedia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "kon directory [%s] niet aanmaken voor bugrapport"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - selecteer alle niet-verwisselbare media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Wat er gebeurt met uitvoerbare rpm bestanden bij --install-src"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - forceer complete berekening van depslist.ordered "
-"bestand.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: onbekende optie \"-%s\", bekijk voor gebruik --help\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"niets om op te waarderen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"de invoer om op te waarderen ontbreekt\n"
-"(één van %s)\n"
+"  namen of rpm bestanden opgegeven via console zullen worden geïnstalleerd.\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1 ../urpmq: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"
-msgstr ""
-"urpmi versie %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dit is vrije software en mag worden verspreid onder te voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - 'gebruik veel woorden' modus.\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stille modus.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --auto-select  - selecteer automatisch pakketten om het systeem op te "
-"waarderen.\n"
+"  -s             - volgend pakket is een bron pakket (zelfde als --src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  -fuzzy             - fuzzy zoeken gebruiken (zelfde als -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - fuzzy zoeken gebruiken (zelfde als --fuzzy).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - volgende pakket is een bron pakket (zelfde als-s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - zoek niet in 'provides' om een pakket te vinden.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --install-src  - installeer alleen bronpakketten (geen uitvoerbare "
-"bestanden)\n"
-
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean      - rpm uit cache verwijderen vóór al het andere\n"
+"  -p             - staat zoeken toe in 'levert' om een pakket te vinden.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - houd niet gebruikte rpms in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - selecteer alle resultaten van console.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - forceer zelfs als sommige pakketten niet bestaan.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - sluit pad gescheiden door komma uit.\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --allow-nodeps - sta toe de gebruiker te vragen om pakketten te\n"
-"                    installeren zonder afhankelijkheids controle.\n"
+"  --verify-rpm   - rpm-handtekening verifiëren vóór installatie.\n"
+"                   (--no-verify-rpm schakelt dit uit, standaard "
+"ingeschakeld).\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-force  - sta toe de gebruiker te vragen om pakketten te\n"
-"                     installeren zonder afhankelijkheids controle en zonder\n"
-"                     integriteits controle.\n"
+"  --best-output  - gebruik de beste interface afhankelijk van de omgeving:\n"
+"                   grafische of tekst modus.\n"
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - schrijf een foutrapport naar de map aangegeven\n"
-"                   door het volgende argument.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - gebruik een grafische interface.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1194,461 +1314,504 @@ msgstr ""
 "  --env          - specifieke omgeving gebruiken (meestal\n"
 "                   een foutrapport).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - gebruik een grafische interface.\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  - gebruik de beste interface afhankelijk van de omgeving:\n"
-"                   grafische of tekst modus.\n"
+"  --bug          - schrijf een foutrapport naar de map aangegeven\n"
+"                   door het volgende argument.\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-handtekening verifiëren vóór installatie.\n"
-"                   (--no-verify-rpm schakelt dit uit, standaard "
-"ingeschakeld).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - sluit pad gescheiden door komma uit.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - selecteer alle resultaten van console.\n"
+"  --proxy-user   - specificeer gebruikersnaam en wachtwoord voor gebruik van "
+"proxy\n"
+"                   authenticatie (formaat is <gebruiker:wachtwoord>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\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 ""
-"  -p             - staat zoeken toe in 'levert' om een pakket te vinden.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - zoek niet in 'provides' om een pakket te vinden.\n"
+"  --proxy        - gebruik specifieke HTTP proxy, het standaard poort "
+"nummer\n"
+"                    is 1080 (formaat is <proxyhost[:poort]>).\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - fuzzy zoeken gebruiken (zelfde als --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limiteer de download snelheid.\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 "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"  -s             - volgend pakket is een bron pakket (zelfde als --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - stille modus.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - 'gebruik veel woorden' modus.\n"
+"  --curl         - gebruik curl om bestanden op afstand te ontvangen.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"  namen of rpm bestanden opgegeven via console zullen worden geïnstalleerd.\n"
+"  --wget         - gebruik wget om bestanden op afstand te ontvangen.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: onbekende optie \"-%s\", bekijk voor gebruik --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Wat er gebeurt met uitvoerbare rpm bestanden bij --install-src"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - sta toe de gebruiker te vragen om pakketten te\n"
+"                     installeren zonder afhankelijkheids controle en zonder\n"
+"                     integriteits controle.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "kon directory [%s] niet aanmaken voor bugrapport"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - sta toe de gebruiker te vragen om pakketten te\n"
+"                    installeren zonder afhankelijkheids controle.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "maakt gebruik van aangegeven omgeving op %s\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - forceer zelfs als sommige pakketten niet bestaan.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Alleen de superuser (root) kan pakketten installeren"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - houd niet gebruikte rpms in cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Eén van de volgende pakketten is benodigd om te installeren: %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean      - rpm uit cache verwijderen vóór al het andere\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Eén van de volgende pakketten is benodigd:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - installeer alleen bronpakketten (geen uitvoerbare "
+"bestanden)\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Wat is uw keuze? (1-%d)"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - volgende pakket is een bron pakket (zelfde als-s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sorry, foutieve keuze, probeer een andere\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  -fuzzy             - fuzzy zoeken gebruiken (zelfde als -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Bepaalde gevraagde pakketen konden niet worden geïnstalleerd:\n"
-"%s\n"
-"Is dit goed?"
+"  --auto-select  - selecteer automatisch pakketten om het systeem op te "
+"waarderen.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "in volgorde om te installeren %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "vanwege onvoldane %s"
+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 versie %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dit is vrije software en mag worden verspreid onder te voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "vanwege missende %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kon medium \"%s\" niet bijwerken\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "vanwege conflicten met %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "ongevraagd"
+msgid "unable to create medium \"%s\"\n"
+msgstr "kon medium \"%s\" niet maken\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 ""
-"De volgende pakketten moeten worden verwijderd om andere te kunnen "
-"opwaarderen:\n"
 "%s\n"
-"Is dit goed?"
+"`with' ontbreekt voor ftp media\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Om aan de afhankelijkheden te voldoen worden de volgende pakketten ook "
-"geïnstalleerd (%d MB)"
+"%s\n"
+"<bijbehorend pad van hdlist> ontbreekt\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 ""
-"U moet root zijn om de volgende afhankelijkheden te installeren:\n"
 "%s\n"
+"niet nodig om <bijbehorend pad van hdlist> te geven met --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "kon bron pakketten niet ontvangen, bezig met afbreken"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "bezig met ontvangen van rpm bestand [%s] ..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% van %s voltooid, ETA = %s, snelheid = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "kan geen updates van een cooker distributie toevoegen\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% voltooid, snelheid = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"onbekende opties '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Gelieve het medium genaamd \"%s\" in apparaat [%s] te plaatsen"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Druk op Enter wanneer u klaar bent..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "De volgende pakketten bevatten een onjuiste handtekening"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forceer aanmaak van hdlist bestanden.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Wilt u doorgaan met de installatie ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - probeer synthesis of hdlist bestand te\n"
+"                   vinden.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (j/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - buffermap headers wissen.\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 ""
-"Installatie is mislukt, sommige bestanden missen:\n"
-"%s\n"
-"Misschien moet u de urpmi database opwaarderen"
+"  --arch         - gebruik aangegeven architectuur, standaard is de versie\n"
+"                   van het pakket geïnstalleerd van een mandrake-uitgave.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Installatie mislukt"
+#: ../urpmi.addmedia:1
+#, fuzzy, 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      - gebruik aangegeven versie, standaard is de versie\n"
+"                   van het pakket geïnstalleerd van een mandrake-uitgave.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "bezig met distribueren van %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - gebruik aangegeven url voor lijst van mirrors, de "
+"standaard\n"
+"                   is %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../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 ""
-"Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
+"  --distrib-XXX  - maak automatisch een medium aan voor het XXX gedeelte "
+"van\n"
+"                   een distributie, XXX kan main, contrib, updates (of iets "
+"anders dat\n"
+"                   geconfigureerd is) zijn.\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Installatie forceren (--force)? (j/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - maakt automatisch alle media van een installatie medium\n"
+"                    aan.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "alles is al geïnstalleerd"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - maak een bijwerkmedium aan.\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 versie %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
-"GNU GPL.\n"
+"gebruik: urpmi.addmedia [opties] <naam> <url> [with <bijbehorend_pad>]\n"
+"waar <url> één van de volgende is:\n"
+"       file://<pad>\n"
+"       ftp://<gebruikersnaam>:<wachtwoord>@<host>/<pad> with <relatieve "
+"bestandsnaam van hdlist>\n"
+"       ftp://<host>/<pad> with <relatieve bestandsnaam van hdlist>\n"
+"       http://<host>/<pad> with <relatieve bestandsnaam van hdlist>\n"
+"       removable://<pad>\n"
 "\n"
-"gebruik:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list          - geeft alle beschikbare pakketten weer\n"
+"en [opties] kunnen zijn:\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - beschikbare media opsommen.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"de invoer om te verwijderen ontbreekt\n"
+"(een van %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - beschikbare knooppunten opsommen bij --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "niets te verwijderen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - beschikbare parallelle aliasen opsommen.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selecteer alle media.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - haal de headers voor het opgegeven pakket uit de urpmi\n"
-"                  database, en stuur ze naar de standaarduitvoer (alleen "
-"root)\n"
+"gebruik: urpmi.removemedia [-a] <naam> ...\n"
+"waar <naam> is een medium naam die verwijderd moet worden.\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      - geef alle bronpakketten voor het downloaden (alleen root "
-"mag dit).\n"
+"de invoer om op te waarderen ontbreekt\n"
+"(één van %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"  -d             - breid de zoekopdracht uit om aan dependencies van "
-"pakketten te voldoen.\n"
+"niets om op te waarderen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - verwijder pakket als een recentere versie al is "
-"geïnstalleerd.\n"
-
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - complete uitvoer met pakket om te verwijderen\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - omgekeerde zoekactie voor wat het pakket vereist.\n"
+"  -d             - forceer complete berekening van depslist.ordered "
+"bestand.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - toont de groepen ook met namen.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - selecteer alle niet-verwisselbare media.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - geeft de versie en release samen met de naam.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - vernieuw alleen bijwerkmedia.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  namen van rpm bestanden opgegeven via console zijn in de wachtrij "
-"geplaatst\n"
+"gebruik: urpmi.update [opties] <naam> ...\n"
+"waar <naam> is een medium naam die bijgewerkt moet worden.\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--lijst-nodes kunnen alleen worden gebruikt met --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versie %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999,2000,2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: onbekende optie \"-%s\", controleer gebruik met --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
-"GNU GPL."
+"  namen van rpm bestanden opgegeven via console zijn in de wachtrij "
+"geplaatst\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "gebruikaanwijzing: urpmf [optie] <bestand>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - geeft de versie en release samen met de naam.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - geeft de tag-naam niet weer (standaard als er geen tag "
-"wordt meegegeven"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - toont de groepen ook met namen.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    line, gaat niet samen met de interactieve modus)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - omgekeerde zoekactie voor wat het pakket vereist.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - geeft alle tags weer."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - complete uitvoer met pakket om te verwijderen\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr ""
-"  --name          - geeft de tag-naam weer: rpm bestandsnaam (als er geen "
-"tag mee is gegeven"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    opdrachtregel zonder pakketnaam)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - geeft de tag-groep weer: groep."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - geeft de tag-grootte weer: grootte."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - geeft de tag serienr: serienr."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - geeft de tag samenvatting: samenvatting."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - geeft de tag omschrijving: omschrijving."
-
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr ""
-"  --provides      - geeft de tag levert: alle 'provides' (meerdere regels)."
-
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --requires      - geeft de tag vereisten: alle 'requires' (meerdere "
-"regels)."
+"  -u             - verwijder pakket als een recentere versie al is "
+"geïnstalleerd.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"  --files         - geeft de tag bestanden: alle bestanden (meerdere regels)."
+"  -d             - breid de zoekopdracht uit om aan dependencies van "
+"pakketten te voldoen.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - geeft de tag conflicten: alle conflicten (meerdere "
-"regels)."
+"  --sources      - geef alle bronpakketten voor het downloaden (alleen root "
+"mag dit).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletes     - geeft de tag \"verouderd\": alle 'obsoletes' (meerdere "
-"regels)."
+"  --headers      - haal de headers voor het opgegeven pakket uit de urpmi\n"
+"                  database, en stuur ze naar de standaarduitvoer (alleen "
+"root)\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr ""
-"  --prereqs       - geeft de tag benodigdheden: alle 'prereqs' (meerdere "
-"regels)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - beschikbare parallelle aliasen opsommen.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "probeer urpmf --help voor meer opties"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - beschikbare knooppunten opsommen bij --parallel.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "geen volledige medialijst gevonden"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - beschikbare media opsommen.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list          - geeft alle beschikbare pakketten weer\n"
+
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versie %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl is mislukt: afgesloten met %d of signaal %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Installatie mislukt op knooppunt %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync is niet geïnstalleerd\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp is mislukt, misschien is een knooppunt onbereikbaar"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync is mislukt: beeindigd met %d of signaal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput is mislukt, misschien is een knooppunt onbereikbaar"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "wget is niet geïnstalleerd\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "op knooppunt %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "syntax fout in configuratie bestand op regel %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp faalde op host %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "medium \"%s\" probeert een hdlist te gebruiken die al wordt gebruikt, "
-#~ "medium genegeerd"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "host %s heeft niet de goede versie van urpmi"
 
 #~ msgid "ignoring option \"%s\" not used"
 #~ msgstr "negeert niet gebruikte optie \"%s\""
@@ -1678,11 +1841,5 @@ msgstr "geen volledige medialijst gevonden"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - geeft deze helptekst.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: onbekende optie \"-%s\", controleer gebruik met --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
-
 #~ msgid "Is it ok?"
 #~ msgstr "Is dit goed?"
diff --git a/po/no.po b/po/no.po
index 2d945b7d..c4eab43d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,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-02-26 14:47+0100\n"
 "Last-Translator: Per �yvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norsk Bokm�l <cooker-i18n@linux-mandrake.com>\n"
@@ -15,1122 +15,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 "installerer %s\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"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versjon %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 "Dette er fri programvare og kan redistribueres uder vilk�rene til GNU "
+
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "bruk: urpmf [valg] <fil>"
+
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
-"Automatisk installasjon av pakker...\n"
-"Du ba om installasjon av pakke %s\n"
+"  --quiet         - do not print tag name (default if no tag given on command"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Er det ok?"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    linje, ikke kompatibel med interaktivt modus)."
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - print all tags."
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Avbryt"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
 
-#: ../_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 "Nn"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    kommandolinje, men uten pakkenavn)."
 
-#: ../_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:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - print tag group: group."
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - print tag size: size."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - print tag serial: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - print tag summary: summary."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - print tag description: description."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - print tag provides: all provides (multiple lines)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - print tag requires: all requires (multiple lines)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - print tag files: all files (multiple lines)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "pr�v urpmf --help for flere valg"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "ingen full medialiste ble funnet"
 
-#: ../_irpm_.c:63
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: kommando ikke funnet\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Ukjent webfetch `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "ukjent protokoll definert for %s"
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "ingen webfetch (curl eller wget for �yeblikket) funnet\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "kunne ikke h�ndtere protokoll: %s"
+msgid "Is this OK?"
+msgstr "Er det ok?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kopiering mislykket: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automatisk installasjon av pakker...\n"
+"Du ba om installasjon av pakke %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget mangler\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "installerer %s\n"
 
-#: ../urpm.pm_.c:288
+#
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget feilet: avsluttet med %d eller signal %d\n"
+msgid "unable to open rpmdb"
+msgstr "kunne ikke �pne rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl er borte\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "kunne ikke n� rpm fil [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "media \"%s\" pr�ver � bruke en allerede brukt liste, media ignorert"
+msgid "%s conflicts with %s"
+msgstr "%s er i konflikt med %s"
 
-#: ../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 ""
-"kan ikke ta h�nd om media \"%s\" da liste fil allerede blir brukt av et "
-"annet media"
+msgid "%s is needed by %s"
+msgstr "%s beh�ves av %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"kunne ikke bruke navn \"%s\" for media uten navn da det allerede er brukt"
+msgid "unable to install package %s"
+msgstr "kunne ikke installere pakke %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"kunne ikke ta media \"%s\" inn til konto da ingen liste fil [%s] eksisterer"
+msgid "unable to remove package %s"
+msgstr "kan ikke fjerne pakke %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kunne ikke bestemme media av denne hdlist filen [%s]"
+msgid "Preparing..."
+msgstr "Forbereder..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kunne ikke n� hdlist fil av \"%s\", media ignorert"
+msgid "...retrieving failed: %s"
+msgstr "...mottak mislykket: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "kan ikke f� tilgang til filen til \"%s\", media ignorert"
+msgid "...retrieving done"
+msgstr "...mottak ferdig"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pr�ver � g� forbi eksisterende media \"%s\", unng�r"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "mottar rpm filer fra media \"%s\"..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kunne ikke finne hdlist fil for \"%s\", media ignorert"
+msgid "malformed input: [%s]"
+msgstr "malformed input: [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kunne ikke finne liste fil for \"%s\", media ignorert"
+msgid "unable to access medium \"%s\""
+msgstr "kunne ikke n� media \"%s\""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "incoherent list file for \"%s\", medium ignored"
+msgid "urpmi database locked"
+msgstr "urpmi database l�st"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kunne ikke inspisere liste fil for \"%s\", media ignorert"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "incoherent media \"%s\" merket fjernbart, men er det ikke"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "for mange monteringspunkter for fjernbart media \"%s\""
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" er ikke valgt"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tar fjernbar enhet som \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunne ikke lese rpm fil [%s] fra media \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "bruker forskjellige fjernbare enheter [%s] for \"%s\""
+msgid "package %s is not found."
+msgstr "pakke %s er ikke funnet."
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kunne ikke motta stinavn for fjernbart media \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "media \"%s\" definerer ikke noen lokasjon for rpm filer"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "kunne ikke skrive config fil [%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:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "skriv config fil [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "det er flere pakker med samme rpm filnavn \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "kunne ikke spalte \"%s\" i fil [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "kunne ikke korrekt spalte [%s] p� verdi \"%s\""
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "eksaminerer parallel h�ndterer i fil [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "F�lgende pakker inneholder %s: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "fant parallel h�ndterer for noder: %s"
+msgid "no package named %s"
+msgstr "ingen pakke kalt %s"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "bruker assosiert media for parallel modus: %s"
+msgid "error registering local packages"
+msgstr "feil ved registrering av lokale pakker"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "kunne ikke n� rpm fil [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "kunne ikke bruke parallel valg \"%s\""
+msgid "retrieving rpm file [%s] ..."
+msgstr "mottar rpm fil [%s] ..."
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis kan ikke brukes med --media, --update eller --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "invalid rpm filnavn [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr "ingen innganger funnet igjen i depsliste"
 
-#: ../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 "relocated %s entries in depslist"
+msgstr "fant igjen %s innganger i depsliste"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "demonterer %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "monterer %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "fjerner %d obsolete hoder i cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "fant %d hoder i cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "bygd hdlist synthesis fil for media \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "eksaminerer hdlist fil [%s]"
 
-#: ../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]"
 msgstr "eksaminerer synthesis fil [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problem med � lese hdlist filen av media \"%s\""
+msgid "building hdlist [%s]"
+msgstr "bygger hdlist [%s]"
 
-#: ../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 "reading headers from medium \"%s\""
+msgstr "leser hoder fra media \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "utf�rer andre rundgang for � beregne avhengigheter\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem med � lese synthesis fil av media \"%s\""
 
-#
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "kunne ikke �pne rpmdb"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "media \"%s\" eksisterer allerede"
+msgid "nothing written in list file for \"%s\""
+msgstr "ingenting skrevet i liste fil for \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "lagt til medium %s"
+msgid "writing list file for medium \"%s\""
+msgstr "skriver listefil for media \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "kan ikke f� tilgang til f�rste installasjonsmedium"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "kunne ikke skrive liste fil av \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "kopierer hdlists fil..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "filen [%s] er allerede brukt i det samme mediumet \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kopiering ferdig"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "unable to parse hdlist file of \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kopiering ferdig"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ingen hdlist fil funnet for media \"%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)"
-msgstr ""
-"kan ikke f� adgang til f�rste installasjonsmedium (ingen Mandrake/base/ "
-"hdlists fil funnet)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "mottak av kilde hdlist (eller synthesis) mislykket"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "mottar hdlists fil..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "eksaminerer MD5SUM fil"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...mottak ferdig"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "kopierer kilde hdlist (eller synthesis) av \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...mottak mislykket: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "mottar kilde hdlist (eller synthesis) av \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "invalid hdlist beskrivelse \"%s\" i hdlists filen"
+msgid "retrieving description file of \"%s\"..."
+msgstr "mottar fil med beskrivelse av \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "pr�ver � velge ikke eksisterende media \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "ingen rpm filer funnet fra [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "kunne ikke lese rpm filer fra [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "Velger flere media: %s"
+msgid "reading rpm files from [%s]"
+msgstr "leser rpm filer fra [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "fjerner media \"%s\""
+msgid "...copying done"
+msgstr "...kopiering ferdig"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi database l�st"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...kopiering ferdig"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kunne ikke n� media \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "kopierer kildefil av \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopierer beskrivelsesfil av \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "kopi av [%s] mislykket"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopierer kilde hdlist (eller synthesis) av \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "kopi av [%s] mislykket"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "eksaminerer MD5SUM fil"
+msgid "copying description file of \"%s\"..."
+msgstr "kopierer beskrivelsesfil av \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopierer kildefil av \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "fjerner media \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "leser rpm filer fra [%s]"
+msgid "selecting multiple media: %s"
+msgstr "Velger flere media: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "kunne ikke lese rpm filer fra [%s]: %s"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ingen rpm filer funnet fra [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "pr�ver � velge ikke eksisterende media \"%s\""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "mottar fil med beskrivelse av \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"kan ikke f� adgang til f�rste installasjonsmedium (ingen Mandrake/base/ "
+"hdlists fil funnet)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "mottar kilde hdlist (eller synthesis) av \"%s\"..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "invalid hdlist beskrivelse \"%s\" i hdlists filen"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "mottak av kilde hdlist (eller synthesis) mislykket"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving hdlists file..."
+msgstr "mottar hdlists fil..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ingen hdlist fil funnet for media \"%s\""
+msgid "copying hdlists file..."
+msgstr "kopierer hdlists fil..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "filen [%s] er allerede brukt i det samme mediumet \"%s\""
+msgid "unable to access first installation medium"
+msgstr "kan ikke f� tilgang til f�rste installasjonsmedium"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "unable to parse hdlist file of \"%s\""
+msgid "added medium %s"
+msgstr "lagt til medium %s"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "kunne ikke skrive liste fil av \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" eksisterer allerede"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "skriver listefil for media \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problem med � lese hdlist filen av media \"%s\""
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ingenting skrevet i liste fil for \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis kan ikke brukes med --media, --update eller --parallel"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "utf�rer andre rundgang for � beregne avhengigheter\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "kunne ikke bruke parallel valg \"%s\""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "leser hoder fra media \"%s\""
+msgid "using associated media for parallel mode: %s"
+msgstr "bruker assosiert media for parallel modus: %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "bygger hdlist [%s]"
+msgid "found parallel handler for nodes: %s"
+msgstr "fant parallel h�ndterer for noder: %s"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "bygd hdlist synthesis fil for media \"%s\""
+msgid "examining parallel handler in file [%s]"
+msgstr "eksaminerer parallel h�ndterer i fil [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "fant %d hoder i cache"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "kunne ikke spalte \"%s\" i fil [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "fjerner %d obsolete hoder i cache"
+msgid "write config file [%s]"
+msgstr "skriv config fil [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "monterer %s"
+msgid "unable to write config file [%s]"
+msgstr "kunne ikke skrive config fil [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "demonterer %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kunne ikke motta stinavn for fjernbart media \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "fant igjen %s innganger i depsliste"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "bruker forskjellige fjernbare enheter [%s] for \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "ingen innganger funnet igjen i depsliste"
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "tar fjernbar enhet som \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "invalid rpm filnavn [%s]"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "for mange monteringspunkter for fjernbart media \"%s\""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "mottar rpm fil [%s] ..."
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kunne ikke inspisere liste fil for \"%s\", media ignorert"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "kunne ikke n� rpm fil [%s]"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "incoherent list file for \"%s\", medium ignored"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "kunne ikke n� rpm fil [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kunne ikke finne liste fil for \"%s\", media ignorert"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "feil ved registrering av lokale pakker"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kunne ikke finne hdlist fil for \"%s\", media ignorert"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "ingen pakke kalt %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pr�ver � g� forbi eksisterende media \"%s\", unng�r"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "F�lgende pakker inneholder %s: %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "kan ikke f� tilgang til filen til \"%s\", media ignorert"
 
-#: ../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\""
-msgstr "det er flere pakker med samme rpm filnavn \"%s\""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kunne ikke n� hdlist fil av \"%s\", media ignorert"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "kunne ikke korrekt spalte [%s] p� verdi \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kunne ikke bestemme media av denne hdlist filen [%s]"
 
-#: ../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 "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
+"kunne ikke ta media \"%s\" inn til konto da ingen liste fil [%s] eksisterer"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "media \"%s\" definerer ikke noen lokasjon for rpm filer"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"kunne ikke bruke navn \"%s\" for media uten navn da det allerede er brukt"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "pakke %s er ikke funnet."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"kan ikke ta h�nd om media \"%s\" da liste fil allerede blir brukt av et "
+"annet media"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" er ikke valgt"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "media \"%s\" pr�ver � bruke en allerede brukt liste, media ignorert"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunne ikke lese rpm fil [%s] fra media \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "media \"%s\" pr�ver � bruke en allerede brukt hdlist, media ignorert"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "incoherent media \"%s\" merket fjernbart, men er det ikke"
+msgid "syntax error in config file at line %s"
+msgstr "syntaks feil i config fil ved linje %s"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "malformed input: [%s]"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% ferdig, hastighet = %s"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "mottar rpm filer fra media \"%s\"..."
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Forbereder..."
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% av %s ferdig, ETA = %s, hastighet = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "kan ikke fjerne pakke %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync mislykket: avsluttet med %d eller signal %d\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "kunne ikke installere pakke %s"
+msgid "ssh is missing\n"
+msgstr "ssh mangler\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s beh�ves av %s"
+msgid "rsync is missing\n"
+msgstr "rsync er borte\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s er i konflikt med %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl mislykket: avsluttet med %d eller signal %d\n"
 
-#: ../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 mislykket, kanskje en node ikke kan n�es"
-
-#: ../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 mislykket, kanskje en node ikke kan n�es"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl er borte\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "p� node %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget feilet: avsluttet med %d eller signal %d\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 "Installasjon mislykket p� node %s"
+msgid "wget is missing\n"
+msgstr "wget mangler\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 "Installasjon er mulig"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "kopiering mislykket: %s"
 
-#: ../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 mislykket p� vert %s"
+msgid "unable to handle protocol: %s"
+msgstr "kunne ikke h�ndtere protokoll: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "vert %s har ingen god versjon av urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "ingen webfetch (curl eller wget for �yeblikket) funnet\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 versjon %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er fri programvare og kan redistribueres under vilk�rene til GNU GPL.\n"
-"\n"
-"bruk:\n"
+msgid "unknown protocol defined for %s"
+msgstr "ukjent protokoll definert for %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         - skriv ut denne hjelpemeldingen.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Ukjent webfetch `%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - velg automatisk en pakke i valg.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Fjerning mislykket"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"For � tilfredstille avhengigheter vil f�lgende pakker bli fjernet (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Sjekker fjerning av f�lgende pakker"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - select all packages matching expression.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ingenting � fjerne"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: ukjent valg \"-%s\", sjekk bruk med --help\n"
+msgid "removing package %s will break your system"
+msgstr "fjerning av pakke %s vil �delegge systemet ditt"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "ukjent pakke"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "ukjente pakker"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "fjerning av pakke %s vil �delegge systemet ditt"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: ukjent valg \"-%s\", sjekk bruk med --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Ingenting � fjerne"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Sjekker fjerning av f�lgende pakker"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - distributed urpmi accross machines of alias.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"For � tilfredstille avhengigheter vil f�lgende pakker bli fjernet (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Fjerning mislykket"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - velg automatisk en pakke i valg.\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         - skriv ut denne hjelpemeldingen.\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 versjon %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"urpme versjon %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Dette er fri programvare og kan redistribueres under vilk�rene til GNU GPL.\n"
 "\n"
 "bruk:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - bruk bare oppdateringsmedia.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"tilbakeringing er :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - bruk bare gitt media, delt med komma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - right parenthesis to close group expression.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - left parenthesis to open group expression.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose mode.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - unary NOT, true if expression is false.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet        - do not print tag name (default if no tag given "
-"on                    line, incompatible with interactive mode).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - print all tags.\n"
+"  -o             - binary OR operator, true if one expression is true.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - print tag group: group.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - print tag size: size.\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - print tag epoch: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include perl code directly as perl -e.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - print tag summary: summary.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - skriv ut versjon, utgivelse og arch med navn.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - print tag description: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignore case distinctions in every pattern.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides     - print tag provides: all provides (multiple lines).\n"
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires     - print tag requires: all requires (multiple lines).\n"
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr "  --files        - print tag files: all files (multiple lines).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+"  --requires     - print tag requires: all requires (multiple lines).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+"  --provides     - print tag provides: all provides (multiple lines).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - print tag description: description.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - skriv ut versjon, utgivelse og arch med navn.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - print tag summary: summary.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include perl code directly as perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - print tag epoch: epoch.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - print tag size: size.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - print tag group: group.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - print all tags.\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given "
+"on                    line, incompatible with interactive mode).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose mode.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - bruk bare gitt media, delt med komma.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"tilbakeringing er :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - bruk bare oppdateringsmedia.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"bruk: urpmi.addmedia [valg] <navn> <url> [with <relative_path>]\n"
-"hvor <url> er en av\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"
+"urpmf versjon %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er fri programvare og kan redistribueres under vilk�rene til GNU GPL.\n"
 "\n"
-"and [options] are from\n"
+"bruk:\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         - bruk wget til � motta fjerne filer.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "alt er allerede installert"
 
-#: ../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         - bruk curl til � motta fjerne filer.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Installasjon er mulig"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - sett grense p� nedlastingshastigheten.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installasjon mislykket"
 
-#: ../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        - bruk spesifisert HTTP proxy, portnummeret antas\n"
-"                   � v�re 1080 som standard (format er <proxyhost[:port]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pr�ve � installere enda hardere (--force)? (j/N) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - spesifiser bruker og passord til bruk for proxy\n"
-"                   autentifisering (format er <bruker:passord>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�ve � installere uten � sjekke avhengigheter? (j/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - opprett et oppdateringsmedium.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distribuerer %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --distrib      - oppretter automatisk alle media fra et installasjons-\n"
-"                   medium.\n"
+"Installasjon mislykket, noen filer mangler:\n"
+"%s\n"
+"Du �nsker antageligvis � oppdatere urpmi databasen din"
 
-#: ../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  - oppretter automatisk et media for XXX del av en\n"
-"                   distribusjon, XXX kan v�re hoved, bidrag, oppdateringer\n"
-"                   eller alt annet som har blitt konfigurert ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - bruk spesifisert url for liste over speil, standard er\n"
-"                   %s\n"
+msgid "Do you want to continue installation ?"
+msgstr "�nsker du � fortsette installasjonen ?"
 
-#: ../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"
-msgstr ""
-"  --version      - bruk spesifisert distribusjonsversjon, standard er tatt\n"
-"                   fra versjonen av distribusjonen gitt av den installerte\n"
-"                   mandrake-release pakken.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "F�lgende pakker har d�rlige signaturer"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - bruk spesifisert arkitektur, standard er arch av\n"
-"                   mandrake-utgivelse pakke installert.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Trykk enter n�r det er ferdig..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - clean headers cache directory.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vennligst sett inn mediumet kalt \"%s\" p� enhet [%s]"
 
-#: ../urpmi.addmedia_.c:75
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "kunne ikke f� tak i kildepakker, avslutter"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"  -h             - pr�v � finn og bruk synthesis eller hdlist\n"
-"                   filen.\n"
-
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - tving generasjon av hdlist filer.\n"
-
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "kan ikke legge til oppdateringer av en cooker distribusjon\n"
+"F�lgende pakker vil bli installert for � tilfredstille avhengigheter (%d MB)"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"Du m� v�re root for � installere f�lgende avhengigheter:\n"
 "%s\n"
-"ingen grunn til � gi <relative path of hdlist> med --distrib"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kunne ikke oppdatere medium \"%s\"\n"
-
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"F�lgende pakker m� fjernes for at andre skal bli oppgradert:\n"
 "%s\n"
-"<relative path of hdlist> mangler\n"
+"er du enig ?"
+
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr "ikke etterspurt"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "due to conflicts with %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "due to missing %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "due to unsatisfied %s"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "for � kunne installere %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"Noen av pakkene som er �nsket kan ikke installeres:\n"
 "%s\n"
-"`with' mangler for ftp media\n"
+"er du enig ?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kunne ikke opprette medium \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"bruk: urpmi.removemedia [-a] <name> ...\n"
-"hvor <name> er et medium navn � fjerne.\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Beklager, d�rlig valg, pr�v igjen\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - velg alle media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Hva er ditt valg? (1-%d) "
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ukjente valg '%s'\n"
+msgid "One of the following packages is needed:"
+msgstr "En av f�lgende pakker beh�ves:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting � fjerne (bruk urpmi.addmedia for � legge til et media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "En av f�lgende pakker beh�ves for � installere %s:"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"inngangen til fjern mangler\n"
-"(en av %s)\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "Bare superbruker har adgang til � installere pakker"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"bruk: urpmi.removemedia [-a] <name> ...\n"
-"hvor <name> er et medium navn � oppdatere.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "bruker spesifikt milj� p� %s\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - oppdater bare oppdateringsmedia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Kan ikke opprette katalog [%s] for feilrapport"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - velg alle ikke-fjernbare media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Hva kan gj�res med bin�re rpm filer n�r man bruker --install-src"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting � oppdatere (bruk urpmi.addmedia for � legge til et media)\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "d�rlig proxy deklarasjon p� kommandolinjen\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"inngangen til oppdatering mangler\n"
-"(en av %s)\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  navn eller rpm filer gitt p� kommandolinjen vil bli installert.\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1 ../urpmq: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"
-msgstr ""
-"urpmi versjon %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er fri programvare og kan redistribueres under vilk�rene til GNU GPL.\n"
-"\n"
-"bruk:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - verbose mode.\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stille modus.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - velger automatisk pakker for oppgradering av systemet.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - neste pakke er en kildepakke (samme som --src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - p�legge fuzzy s�k (samme som -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impose fuzzy search (same as --fuzzy).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - neste pakke er en kildepakke (samme som -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - do not search in provides to find package.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - installer bare kildepakke (ingen bin�re).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - allow search in provides to find package.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean      - fjern rpm fra cache f�r noe annet.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - velg alle treff p� kommandolinjen.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - ekskluder sti separert med komma.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force        - tving p�kallelse selv om noen pakker ikke eksisterer.\n"
+"  --verify-rpm   - verifiser rpm signatur f�r installasjon.\n"
+"                   (--no-verify-rpm sl�r det av, standard er p�sl�tt).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - tillat � sp�rre bruker om � installere pakker uten\n"
-"                   sjekking av avhengigheter.\n"
+"  --best-output  - velg beste grensesnitt ihht. milj�et:\n"
+"                   X eller tekstmodus.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - bruk X grensesnitt.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
-"  --allow-force  - tillat sp�rre bruker om � installere pakker uten\n"
-"                   sjekking av avhengighet og integritet.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr "  --env          - bruk spesifikt milj� (typisk en feilrapport).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1138,439 +1269,474 @@ msgstr ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 
-#: ../urpmi_.c:98
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr "  --env          - bruk spesifikt milj� (typisk en feilrapport).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - bruk X grensesnitt.\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --best-output  - velg beste grensesnitt ihht. milj�et:\n"
-"                   X eller tekstmodus.\n"
+"  --proxy-user   - spesifiser bruker og passord til bruk for proxy\n"
+"                   autentifisering (format er <bruker:passord>).\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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --verify-rpm   - verifiser rpm signatur f�r installasjon.\n"
-"                   (--no-verify-rpm sl�r det av, standard er p�sl�tt).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - ekskluder sti separert med komma.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - velg alle treff p� kommandolinjen.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - allow search in provides to find package.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - do not search in provides to find package.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impose fuzzy search (same as --fuzzy).\n"
-
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - neste pakke er en kildepakke (samme som --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - stille modus.\n"
+"  --proxy        - bruk spesifisert HTTP proxy, portnummeret antas\n"
+"                   � v�re 1080 som standard (format er <proxyhost[:port]>).\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - verbose mode.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - sett grense p� nedlastingshastigheten.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  navn eller rpm filer gitt p� kommandolinjen vil bli installert.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - bruk curl til � motta fjerne filer.\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 "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - bruk wget til � motta fjerne filer.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Hva kan gj�res med bin�re rpm filer n�r man bruker --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - tillat sp�rre bruker om � installere pakker uten\n"
+"                   sjekking av avhengighet og integritet.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Kan ikke opprette katalog [%s] for feilrapport"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - tillat � sp�rre bruker om � installere pakker uten\n"
+"                   sjekking av avhengigheter.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "bruker spesifikt milj� p� %s\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - tving p�kallelse selv om noen pakker ikke eksisterer.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Bare superbruker har adgang til � installere pakker"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - keep rpm not used in cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "En av f�lgende pakker beh�ves for � installere %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean      - fjern rpm fra cache f�r noe annet.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "En av f�lgende pakker beh�ves:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - installer bare kildepakke (ingen bin�re).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hva er ditt valg? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - neste pakke er en kildepakke (samme som -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Beklager, d�rlig valg, pr�v igjen\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - p�legge fuzzy s�k (samme som -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Noen av pakkene som er �nsket kan ikke installeres:\n"
-"%s\n"
-"er du enig ?"
+"  --auto-select  - velger automatisk pakker for oppgradering av systemet.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "for � kunne installere %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "due to unsatisfied %s"
+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 versjon %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er fri programvare og kan redistribueres under vilk�rene til GNU GPL.\n"
+"\n"
+"bruk:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "due to missing %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kunne ikke oppdatere medium \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "due to conflicts with %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "ikke etterspurt"
+msgid "unable to create medium \"%s\"\n"
+msgstr "kunne ikke opprette medium \"%s\"\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 ""
-"F�lgende pakker m� fjernes for at andre skal bli oppgradert:\n"
 "%s\n"
-"er du enig ?"
+"`with' mangler for ftp media\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"F�lgende pakker vil bli installert for � tilfredstille avhengigheter (%d MB)"
+"%s\n"
+"<relative path of hdlist> mangler\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 ""
-"Du m� v�re root for � installere f�lgende avhengigheter:\n"
 "%s\n"
+"ingen grunn til � gi <relative path of hdlist> med --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "kunne ikke f� tak i kildepakker, avslutter"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "mottar rpm fil [%s] ..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% av %s ferdig, ETA = %s, hastighet = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "kan ikke legge til oppdateringer av en cooker distribusjon\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% ferdig, hastighet = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ukjente valg '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vennligst sett inn mediumet kalt \"%s\" p� enhet [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Trykk enter n�r det er ferdig..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "F�lgende pakker har d�rlige signaturer"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - tving generasjon av hdlist filer.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "�nsker du � fortsette installasjonen ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - pr�v � finn og bruk synthesis eller hdlist\n"
+"                   filen.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (j/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - clean headers cache directory.\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 ""
-"Installasjon mislykket, noen filer mangler:\n"
-"%s\n"
-"Du �nsker antageligvis � oppdatere urpmi databasen din"
+"  --arch         - bruk spesifisert arkitektur, standard er arch av\n"
+"                   mandrake-utgivelse pakke installert.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Installasjon mislykket"
+#: ../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      - bruk spesifisert distribusjonsversjon, standard er tatt\n"
+"                   fra versjonen av distribusjonen gitt av den installerte\n"
+"                   mandrake-release pakken.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distribuerer %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - bruk spesifisert url for liste over speil, standard er\n"
+"                   %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pr�ve � installere uten � sjekke avhengigheter? (j/N) "
+#: ../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  - oppretter automatisk et media for XXX del av en\n"
+"                   distribusjon, XXX kan v�re hoved, bidrag, oppdateringer\n"
+"                   eller alt annet som har blitt konfigurert ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pr�ve � installere enda hardere (--force)? (j/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - oppretter automatisk alle media fra et installasjons-\n"
+"                   medium.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "alt er allerede installert"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - opprett et oppdateringsmedium.\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 versjon %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er fri programvare og kan redistribueres under vilk�rene til GNU GPL.\n"
+"bruk: urpmi.addmedia [valg] <navn> <url> [with <relative_path>]\n"
+"hvor <url> er en av\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"
-"bruk:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - lister tilgjengelige pakker.\n"
+"and [options] are from\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - lister tilgjengelige medier.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"inngangen til fjern mangler\n"
+"(en av %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - lister tilgjengelige n�r --parallel brukes.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting � fjerne (bruk urpmi.addmedia for � legge til et media)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - list tilgjengelige parallel aliaser.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - velg alle media.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - trekk ut hoder for pakke listed fra urpmi db til\n"
-"                   stdout (kun root).\n"
+"bruk: urpmi.removemedia [-a] <name> ...\n"
+"hvor <name> er et medium navn � fjerne.\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - gir alle kildepakker f�r nedlasting (kun root).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"inngangen til oppdatering mangler\n"
+"(en av %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - utvid foresp�rsel til pakkeavhengigheter.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting � oppdatere (bruk urpmi.addmedia for � legge til et media)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - fjerner pakke hvis en nyere versjon allerede er er "
-"installert.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - velg alle ikke-fjernbare media.\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - oppdater bare oppdateringsmedia.\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  -c             - fullstendig utskrift med pakke som skal bli fjernet.\n"
+"bruk: urpmi.removemedia [-a] <name> ...\n"
+"hvor <name> er et medium navn � oppdatere.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverse search to what requires package.\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes kan bare brukes med --parallel"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - skriv ut grupper ogs� med navn.\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke lese rpm fil \"%s\"\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - skriv ut versjon og utgivelse ogs� med navn.\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  navn eller rpm filer gitt p� kommandolinjem er etterspurt.\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes kan bare brukes med --parallel"
-
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versjon %s"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - skriv ut versjon og utgivelse ogs� med navn.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - skriv ut grupper ogs� med navn.\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr "Dette er fri programvare og kan redistribueres uder vilk�rene til GNU "
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverse search to what requires package.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "bruk: urpmf [valg] <fil>"
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr ""
+"  -c             - fullstendig utskrift med pakke som skal bli fjernet.\n"
 
-#: placeholder.h:22
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -u             - fjerner pakke hvis en nyere versjon allerede er er "
+"installert.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    linje, ikke kompatibel med interaktivt modus)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - utvid foresp�rsel til pakkeavhengigheter.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - print all tags."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - gir alle kildepakker f�r nedlasting (kun root).\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          - print tag name: rpm filename (assumed if no tag given on"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    kommandolinje, men uten pakkenavn)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - print tag group: group."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - print tag size: size."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - print tag serial: serial."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - print tag summary: summary."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - print tag description: description."
+"  --headers      - trekk ut hoder for pakke listed fra urpmi db til\n"
+"                   stdout (kun root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - list tilgjengelige parallel aliaser.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - lister tilgjengelige n�r --parallel brukes.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - lister tilgjengelige medier.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - lister tilgjengelige pakker.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (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 ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "pr�v urpmf --help for flere valg"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "ingen full medialiste ble funnet"
+"urpmq versjon %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er fri programvare og kan redistribueres under vilk�rene til GNU GPL.\n"
+"\n"
+"bruk:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl mislykket: avsluttet med %d eller signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Installasjon mislykket p� node %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync er borte\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp mislykket, kanskje en node ikke kan n�es"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync mislykket: avsluttet med %d eller signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput mislykket, kanskje en node ikke kan n�es"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh mangler\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "p� node %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "syntaks feil i config fil ved linje %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp mislykket p� vert %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "media \"%s\" pr�ver � bruke en allerede brukt hdlist, media ignorert"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "vert %s har ingen god versjon av urpmi"
 
 #~ msgid "ignoring option \"%s\" not used"
 #~ msgstr "ignorerer valg \"%s\" ikke brukt"
@@ -1600,12 +1766,6 @@ msgstr "ingen full medialiste ble funnet"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - skriv ut denne hjelpemeldingen.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: kan ikke lese rpm fil \"%s\"\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi er ikke installert"
 
@@ -1672,9 +1832,6 @@ msgstr "ingen full medialiste ble funnet"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "d�rlig proxy deklarasjon p� kommandolinjen\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr "bruk: urpmi.addmedia [--update] <name> <url> [with <relative_path>]"
 
diff --git a/po/pl.po b/po/pl.po
index 257b62b9..cee41023 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pl\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-24 11:45+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <pl@li.org>\n"
@@ -14,1157 +14,1253 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instalowanie %s\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 "TtYy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf wersja %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Automatyczna instalacja pakiet�w...\n"
-"Zg�oszono polecenie instalacji pakietu %s\n"
+"To jest otwarte oprogramowanie i mo�e by� rozprowadzane na zasadach licencji "
+"GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "W porz�dku?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "U�ycie: urpmf [opcje] <plik>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "OK"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - bez wy�wietlania nazwy znacznika\n"
+"(domy�lny tryb je�li nie podano znacznika w wierszu"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Anuluj"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                   polecenia, niezgodne z trybem interaktywnym)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - wy�wietla wszystkie znaczniki."
 
-#: ../_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 "TtYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - wy�wietla znacznik name: nazwa pliku rpm (tak�e gdy"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (T/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    nie podano nazwy pakietu lub znacznik bez nazwy)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - wy�wietla znacznik group: grupa."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - wy�wietla znacznik size: rozmiar."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - wy�wietla znacznik serial: numer."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - wy�wietla znacznik summary: zestawienie."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - wy�wietla znacznik description: opis."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - wy�wietla zanacznik provides: (wszyst. pakiety)"
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - wy�wietla znacznik requires: wszystkie zale�no�ci."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - wy�wietla znacznik files: wszystkie pliki."
 
-#: ../_irpm_.c:63
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr "  --conflicts     - wy�wietla znacznik conflicts: wszystkie konflikty."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - wy�wietla znacznik obsoletes: wszystkie przestarza�e pak."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - wy�wietla znacznik prereqs: wszystkie wymagania."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "spr�buj urpmf --help aby uzyska� wi�cej opcji"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "nie mo�na odnale�� pe�nej listy no�nik�w"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: polecenie nie zosta�o odnalezione\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Nieznany typ pobierania `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (T/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "nieznany protok� zdefiniowany dla %s"
+msgid "Cancel"
+msgstr "Anuluj"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "Nie znaleziono programu do pobierania stron (curl lub wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nie mo�na obs�u�y� protoko�u: %s"
+msgid "Is this OK?"
+msgstr "W porz�dku?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kopiowanie nie powiod�o si�: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automatyczna instalacja pakiet�w...\n"
+"Zg�oszono polecenie instalacji pakietu %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "brak programu wget\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instalowanie %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "b��d wget: wyj�cie z warto�ci� %d lub sygna�em %d\n"
+msgid "unable to open rpmdb"
+msgstr "nie mo�na otworzy� bazy danych rpm"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "brak programu curl\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "nie mo�na uzyska� dost�pu do pliku rpm [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "no�nik \"%s\" pr�buje u�y� ju� wykorzystan� list�, zignorowano no�nik"
+msgid "%s conflicts with %s"
+msgstr "Pakiet %s koliduje z pakietem %s"
 
-#: ../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 ""
-"Nie mo�na sprawdzi� \"%s\" gdy� plik listy jest u�ywany przez inny no�nik "
+msgid "%s is needed by %s"
+msgstr "Pakiet %s jest wymagany przez %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nie mo�na u�y� nazwy \"%s\" dla nienazwanego no�nika, poniewa� jest ona ju� "
-"u�ywana"
+msgid "unable to install package %s"
+msgstr "nie mo�na zainstalowa� pakietu %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"nie mo�na przypisa� no�nika \"%s\" do konta, gdy� nie istnieje plik listy [%"
-"s]"
+msgid "unable to remove package %s"
+msgstr "nie mo�na usun�� pakietu %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nie mo�na okre�li� no�nika zwi�zanego z tym plikiem hdlist [%s]"
+msgid "Preparing..."
+msgstr "Przygotowywanie..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "nie mo�na uzyska� dost�pu do pliku hdlist \"%s\", zignorowano no�nik"
+msgid "...retrieving failed: %s"
+msgstr "...pobieranie nie powiod�o si�: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"nie mo�na uzyska� dost�pu do pliku listy zwi�zanego z \"%s\", zignorowano "
-"no�nik"
+msgid "...retrieving done"
+msgstr "...pobieranie zako�czone"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pr�ba prze��czenia istniej�cego no�nika \"%s\", anulowano"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "pobieranie plik�w rpm z no�nika \"%s\"..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "nie mo�na znale�� pliku hdlist dla \"%s\" no�nik zignorowano"
+msgid "malformed input: [%s]"
+msgstr "niepoprawne wej�cie: [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nie mo�na znale�� pliku listy dla \"%s\", no�nik zignorowano"
+msgid "unable to access medium \"%s\""
+msgstr "nie mo�na uzyska� dost�pu do no�nika \"%s\""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "niesp�jny plik listy dla \"%s\", no�nik zignorowano"
+msgid "urpmi database locked"
+msgstr "baza danych urpmi jest zablokowana"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nie mo�na zbada� pliku listy zwi�zanego z \"%s\", no�nik zignorowano"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "niesp�jny no�nik \"%s\" zaznaczony jako wymienny ale niekoniecznie"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "zbyt du�o punkt�w montowania dla wymiennego no�nika \"%s\""
+msgid "medium \"%s\" is not selected"
+msgstr "no�nik \"%s\" nie zosta� wybrany"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "traktowanie nap�du wymiennego jako \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nie mo�na czyta� pliku rpm [%s] z no�nika \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "u�ywanie innego urz�dzenia wymiennego [%s] dla \"%s\""
+msgid "package %s is not found."
+msgstr "pakiet %s nie zosta� odnaleziony."
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nie mo�na pobra� �cie�ki dla no�nika wymiennego \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "no�nik \"%s\" nie okre�la �adnej lokalizacji dla plik�w rpm"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nie mo�na zapisa� pliku konfiguracyjnego [%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:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "zapisywanie pliku konfiguracyjnego [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "Istnieje wiele pakiet�w o tej samej nazwie pliku rpm \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "nie mo�na przetworzy� \"%s\" w pliku [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nie mo�na poprawnie przetworzy� [%s] przy warto�ci \"%s\""
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "badanie r�wnoleg�ej funkcji obs�ugi w pliku [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Nast�puj�ce pakiety zawieraj� %s: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "znaleziono r�wnoleg�� funkcj� obs�ugi dla w�z��w: %s"
+msgid "no package named %s"
+msgstr "brak pakietu o nazwie %s"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "u�ycie no�nika przypisanego dla trybu r�wnoleg�ego: %s"
+msgid "error registering local packages"
+msgstr "b��d w trakcie rejestrowania pakiet�w lokalnych"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "nie mo�na uzyska� dost�pu do pliku rpm [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "nie mo�na u�y� r�wnoleg�ej opcji \"%s\""
+msgid "retrieving rpm file [%s] ..."
+msgstr "pobieranie pliku rpm [%s] ..."
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr ""
-"opcja --synthesis nie mo�e by� u�ywana z opcj� --media, --update lub --"
-"parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "niepoprawna nazwa pliku rpm [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr "�aden wpis nie zosta� relokowany na li�cie zale�no�ci deplist"
 
-#: ../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 "relocated %s entries in depslist"
+msgstr "relokowano %s wpis�w w li�cie zale�no�ci deplist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "odmontowywanie %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "montowanie %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "usuwanie %d przestarza�ych nag�owk�w w pami�ci cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "znaleziono %d nag�owk�w w pami�ci podr�cznej"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "zbudowano plik syntezy dla no�nika \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "badanie pliku hdlist [%s]"
 
-#: ../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]"
 msgstr "sprawdzanie pliku syntezy [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "wyst�pi� problem podczas odczytu pliku hdlist dla no�nika \"%s\""
+msgid "building hdlist [%s]"
+msgstr "budowanie pliku hdlist [%s]"
 
-#: ../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 "reading headers from medium \"%s\""
+msgstr "odczytywanie nag��wk�w z no�nika \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "podejmowanie drugiej akcji w celu obliczenia zale�no�ci\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "wyst�pi� problem podczas odczytu pliku syntezy dla no�nika \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "nie mo�na otworzy� bazy danych rpm"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "no�nik \"%s\" ju� istnieje"
+msgid "nothing written in list file for \"%s\""
+msgstr "nic nie zosta�o zapisane do pliku listy dla \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "dodany no�nik %s"
+msgid "writing list file for medium \"%s\""
+msgstr "zapisywanie pliku listy dla no�nika \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "brak dost�pu do pierwszego no�nika instalacyjnego"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "nie mo�na zapisa� pliku listy zwi�zanego z \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "kopiowanie pliku hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "plik [%s] ju� zosta� u�yty w tym samym no�niku \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kopiowanie zako�czone"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nie mo�na przetworzy� pliku hdlist zwi�zanego z \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kopiowanie zako�czone"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nie znaleziono pliku hdlist dla no�nika \"%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 "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
-"brak dost�pu do pierwszego no�nika instalacyjnego (nie znaleziono pliku "
-"Mandrake/base/hdlists)"
+"pobieranie pliku �r�d�owego hdlist (lub syntezy) zako�czone niepowodzeniem"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "pobieranie pliku hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "badanie pliku MD5SUM"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...pobieranie zako�czone"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "kopiowanie �r�d�a hdlist (lub syntezy) zwi�zanego z \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pobieranie nie powiod�o si�: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "pobiera plik �r�d�owy hdlist (lub syntezy) zwi�zany z \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "niepoprawny opis hdlist \"%s\" w pliku hdlist"
+msgid "retrieving description file of \"%s\"..."
+msgstr "pobieranie pliku opisu zwi�zanego z \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "pr�ba wyboru nieistniej�cego no�nika \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nie znaleziono �adnych plik�w rpm z [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nie mo�na czyta� plik�w rpm z [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "wybieranie wielu no�nik�w: %s"
+msgid "reading rpm files from [%s]"
+msgstr "odczytywanie plik�w rpm z [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "usuwanie no�nika \"%s\""
+msgid "...copying done"
+msgstr "...kopiowanie zako�czone"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "baza danych urpmi jest zablokowana"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...kopiowanie zako�czone"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nie mo�na uzyska� dost�pu do no�nika \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "kopiowanie listy �r�de� zwi�zanej z \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopiowanie pliku opisowego zwi�zanego z \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "kopiowanie [%s] zako�czone niepowodzeniem"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopiowanie �r�d�a hdlist (lub syntezy) zwi�zanego z \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "kopiowanie [%s] zako�czone niepowodzeniem"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "badanie pliku MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "kopiowanie pliku opisowego zwi�zanego z \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopiowanie listy �r�de� zwi�zanej z \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "usuwanie no�nika \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "odczytywanie plik�w rpm z [%s]"
+msgid "selecting multiple media: %s"
+msgstr "wybieranie wielu no�nik�w: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "nie mo�na czyta� plik�w rpm z [%s]: %s"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nie znaleziono �adnych plik�w rpm z [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "pr�ba wyboru nieistniej�cego no�nika \"%s\""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "pobieranie pliku opisu zwi�zanego z \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"brak dost�pu do pierwszego no�nika instalacyjnego (nie znaleziono pliku "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "pobiera plik �r�d�owy hdlist (lub syntezy) zwi�zany z \"%s\"..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "niepoprawny opis hdlist \"%s\" w pliku hdlist"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-"pobieranie pliku �r�d�owego hdlist (lub syntezy) zako�czone niepowodzeniem"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving hdlists file..."
+msgstr "pobieranie pliku hdlist..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nie znaleziono pliku hdlist dla no�nika \"%s\""
+msgid "copying hdlists file..."
+msgstr "kopiowanie pliku hdlist..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "plik [%s] ju� zosta� u�yty w tym samym no�niku \"%s\""
+msgid "unable to access first installation medium"
+msgstr "brak dost�pu do pierwszego no�nika instalacyjnego"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "nie mo�na przetworzy� pliku hdlist zwi�zanego z \"%s\""
+msgid "added medium %s"
+msgstr "dodany no�nik %s"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "nie mo�na zapisa� pliku listy zwi�zanego z \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "no�nik \"%s\" ju� istnieje"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "zapisywanie pliku listy dla no�nika \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "wyst�pi� problem podczas odczytu pliku hdlist dla no�nika \"%s\""
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nic nie zosta�o zapisane do pliku listy dla \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
+"opcja --synthesis nie mo�e by� u�ywana z opcj� --media, --update lub --"
+"parallel"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "podejmowanie drugiej akcji w celu obliczenia zale�no�ci\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "nie mo�na u�y� r�wnoleg�ej opcji \"%s\""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "odczytywanie nag��wk�w z no�nika \"%s\""
+msgid "using associated media for parallel mode: %s"
+msgstr "u�ycie no�nika przypisanego dla trybu r�wnoleg�ego: %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "budowanie pliku hdlist [%s]"
+msgid "found parallel handler for nodes: %s"
+msgstr "znaleziono r�wnoleg�� funkcj� obs�ugi dla w�z��w: %s"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "zbudowano plik syntezy dla no�nika \"%s\""
+msgid "examining parallel handler in file [%s]"
+msgstr "badanie r�wnoleg�ej funkcji obs�ugi w pliku [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "znaleziono %d nag�owk�w w pami�ci podr�cznej"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "nie mo�na przetworzy� \"%s\" w pliku [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "usuwanie %d przestarza�ych nag�owk�w w pami�ci cache"
+msgid "write config file [%s]"
+msgstr "zapisywanie pliku konfiguracyjnego [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "montowanie %s"
+msgid "unable to write config file [%s]"
+msgstr "nie mo�na zapisa� pliku konfiguracyjnego [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "odmontowywanie %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nie mo�na pobra� �cie�ki dla no�nika wymiennego \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "relokowano %s wpis�w w li�cie zale�no�ci deplist"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "u�ywanie innego urz�dzenia wymiennego [%s] dla \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "�aden wpis nie zosta� relokowany na li�cie zale�no�ci deplist"
+#: ../urpm.pm:1
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "traktowanie nap�du wymiennego jako \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "niepoprawna nazwa pliku rpm [%s]"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "zbyt du�o punkt�w montowania dla wymiennego no�nika \"%s\""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "pobieranie pliku rpm [%s] ..."
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nie mo�na zbada� pliku listy zwi�zanego z \"%s\", no�nik zignorowano"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "nie mo�na uzyska� dost�pu do pliku rpm [%s]"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "niesp�jny plik listy dla \"%s\", no�nik zignorowano"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "nie mo�na uzyska� dost�pu do pliku rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nie mo�na znale�� pliku listy dla \"%s\", no�nik zignorowano"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "b��d w trakcie rejestrowania pakiet�w lokalnych"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "nie mo�na znale�� pliku hdlist dla \"%s\" no�nik zignorowano"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "brak pakietu o nazwie %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pr�ba prze��czenia istniej�cego no�nika \"%s\", anulowano"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Nast�puj�ce pakiety zawieraj� %s: %s"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+"nie mo�na uzyska� dost�pu do pliku listy zwi�zanego z \"%s\", zignorowano "
+"no�nik"
 
-#: ../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\""
-msgstr "Istnieje wiele pakiet�w o tej samej nazwie pliku rpm \"%s\""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "nie mo�na uzyska� dost�pu do pliku hdlist \"%s\", zignorowano no�nik"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nie mo�na poprawnie przetworzy� [%s] przy warto�ci \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nie mo�na okre�li� no�nika zwi�zanego z tym plikiem hdlist [%s]"
 
-#: ../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 "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
+"nie mo�na przypisa� no�nika \"%s\" do konta, gdy� nie istnieje plik listy [%"
+"s]"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "no�nik \"%s\" nie okre�la �adnej lokalizacji dla plik�w rpm"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"nie mo�na u�y� nazwy \"%s\" dla nienazwanego no�nika, poniewa� jest ona ju� "
+"u�ywana"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "pakiet %s nie zosta� odnaleziony."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"Nie mo�na sprawdzi� \"%s\" gdy� plik listy jest u�ywany przez inny no�nik "
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "no�nik \"%s\" nie zosta� wybrany"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "no�nik \"%s\" pr�buje u�y� ju� wykorzystan� list�, zignorowano no�nik"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nie mo�na czyta� pliku rpm [%s] z no�nika \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"no�nik \"%s\" pr�buje u�ywa� wykorzystany ju� plik hdlist, zignorowano no�nik"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "niesp�jny no�nik \"%s\" zaznaczony jako wymienny ale niekoniecznie"
+msgid "syntax error in config file at line %s"
+msgstr "b��d sk�adni pliku konfiguracyjnego w wierszu %s"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "niepoprawne wej�cie: [%s]"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% gotowe, szybko�� = %s"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "pobieranie plik�w rpm z no�nika \"%s\"..."
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Przygotowywanie..."
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% z %s gotowe, ETA = %s, szybko�� = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "nie mo�na usun�� pakietu %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "b��d rsync: wyj�cie z warto�ci� %d lub sygna�em %d\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "nie mo�na zainstalowa� pakietu %s"
+msgid "ssh is missing\n"
+msgstr "brak ssh\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "Pakiet %s jest wymagany przez %s"
+msgid "rsync is missing\n"
+msgstr "brak programu rsync\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "Pakiet %s koliduje z pakietem %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "b��d curl: wyj�cie z warto�ci� %d lub sygna�em %d\n"
 
-#: ../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 "b�ad mput, by� mo�e w�ze� jest nieosi�galny"
-
-#: ../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 "b��d rshp, by� mo�e w�ze� jest nieosi�galny"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "brak programu curl\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "w w�le %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "b��d wget: wyj�cie z warto�ci� %d lub sygna�em %d\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 "Dla w�z�a %s instalacja nie powiod�a si�"
+msgid "wget is missing\n"
+msgstr "brak programu wget\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 "Instalacja jest mo�liwa"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "kopiowanie nie powiod�o si�: %s"
 
-#: ../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 "po��czenie scp z komputerem %s zako�czone niepowodzeniem"
+msgid "unable to handle protocol: %s"
+msgstr "nie mo�na obs�u�y� protoko�u: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "komputer %s nie posiada odpowiednie wersji urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "Nie znaleziono programu do pobierania stron (curl lub wget)\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 ""
-"urpmi wersja %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"To jest oprogramowanie otwarte i mo�e by� rozpowszechniane na zasadach "
-"licencji GNU GPL.\n"
-"\n"
-"u�ycie:\n"
+msgid "unknown protocol defined for %s"
+msgstr "nieznany protok� zdefiniowany dla %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         - wy�wietla ten komunikat pomocy.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Nieznany typ pobierania `%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatycznie wybiera najlepszy pakiet z listy.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Usuwanie zako�czone niepowodzeniem"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - sprawdza, czy instalacja zostanie przeprowadzona "
-"prawid�owo.\n"
+"W celu spe�nienia zale�no�ci zostan� usuni�te nast�puj�ce pakiety (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - rozproszone urpmi z u�yciem komputer�w aliasu.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Zaznaczanie do usuni�cia nast�puj�cych pakiet�w"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - wybiera wszystkie pasuj�ce pakiety.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Brak element�w do usuni�cia."
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: nieznana opcja \"-%s\", sprawd� wywo�anie z opcj� --help\n"
+msgid "removing package %s will break your system"
+msgstr "usuwanie pakietu %s spowoduje uszkodzenie systemu"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "nieznany pakiet"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "nieznane pakiety"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "usuwanie pakietu %s spowoduje uszkodzenie systemu"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: nieznana opcja \"-%s\", sprawd� wywo�anie z opcj� --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Brak element�w do usuni�cia."
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - wybiera wszystkie pasuj�ce pakiety.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Zaznaczanie do usuni�cia nast�puj�cych pakiet�w"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - rozproszone urpmi z u�yciem komputer�w aliasu.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"W celu spe�nienia zale�no�ci zostan� usuni�te nast�puj�ce pakiety (%d MB)"
+"  --test         - sprawdza, czy instalacja zostanie przeprowadzona "
+"prawid�owo.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Usuwanie zako�czone niepowodzeniem"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatycznie wybiera najlepszy pakiet z listy.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - wy�wietla ten komunikat pomocy.\n"
+
+#: ../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 ""
-"urpmq wersja %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"To jest otwarte oprogramowanie i mo�e by� rozpowszechniane na zasadach "
-"licencji  GNU GPL.\n"
+"urpmi wersja %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"To jest oprogramowanie otwarte i mo�e by� rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
 "\n"
 "u�ycie:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - u�ywa tylko no�nik�w aktualizacyjnych.\n"
-
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
-"  --media        - u�ywa tylko podanych no�nik�w, rozdzielonych "
-"przecinkami.\n"
+"wywo�anie zwrotne jest :\n"
+"%s\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - u�ywa pliku syntezy podanego zamiast bazy urpmi.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - prawy nawias do zamykania wyra�enia grupowego.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - tryb komunikatywny.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - lewy nawias do otwierania wyra�enia grupowego.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !             - modyfikator NOT, prawda je�li wyra�enie fa�szywe.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - bez wy�wietlania nazwy znacznika\n"
-"                    (domy�lny tryb je�li nie podano znacznika w wierszu).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - wy�wietla wszystkie znaczniki.\n"
+"  -a             - operator binarny AND, prawda gdy jedno wyra�enie "
+"prawdziwe.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - wy�wietla znacznik name: nazwa pliku rpm (tak�e "
-"gdy                    nie podano w wierszu poza nazw� innych znacznik�w).\n"
+"  -a             - operator binarny AND, prawda gdy oba wyra�enia "
+"prawdziwe.\n"
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - wy�wietla znacznik group: grupa.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - do��cza kod perla bezpo�rednio jako perl -e.\n"
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - wy�wietla znacznik size: rozmiar.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - wy�wietla wersj�, wydanie oraz archiwum z nazw�.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - wy�wietla znacznik epoch: iteracja.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignoruje wielko�� liter we wszystkich wzorcach.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - wy�wietla znacznik summary: zestawienie.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+"  --obsoletes     - wy�wietla znacznik obsoletes: wszystkie przestarza�e "
+"pak.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - wy�wietla znacznik description: opis.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+"  --conflicts     - wy�wietla znacznik conflicts: wszystkie konflikty.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr "  --provides      - wy�wietla zanacznik provides: wszyst. pakiety.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - wy�wietla znacznik files: wszystkie pliki.\n"
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 "  --requires      - wy�wietla znacznik requires: wszystkie zale�no�ci.\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - wy�wietla znacznik files: wszystkie pliki.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+msgstr "  --provides      - wy�wietla zanacznik provides: wszyst. pakiety.\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr ""
-"  --conflicts     - wy�wietla znacznik conflicts: wszystkie konflikty.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - wy�wietla znacznik description: opis.\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - wy�wietla znacznik obsoletes: wszystkie przestarza�e "
-"pak.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - wy�wietla znacznik summary: zestawienie.\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignoruje wielko�� liter we wszystkich wzorcach.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - wy�wietla znacznik epoch: iteracja.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - wy�wietla wersj�, wydanie oraz archiwum z nazw�.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - wy�wietla znacznik size: rozmiar.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - do��cza kod perla bezpo�rednio jako perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - wy�wietla znacznik group: grupa.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - operator binarny AND, prawda gdy oba wyra�enia "
-"prawdziwe.\n"
+"  --name          - wy�wietla znacznik name: nazwa pliku rpm (tak�e "
+"gdy                    nie podano w wierszu poza nazw� innych znacznik�w).\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - wy�wietla wszystkie znaczniki.\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -a             - operator binarny AND, prawda gdy jedno wyra�enie "
-"prawdziwe.\n"
-
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !             - modyfikator NOT, prawda je�li wyra�enie fa�szywe.\n"
+"  --quiet         - bez wy�wietlania nazwy znacznika\n"
+"                    (domy�lny tryb je�li nie podano znacznika w wierszu).\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - lewy nawias do otwierania wyra�enia grupowego.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - tryb komunikatywny.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - prawy nawias do zamykania wyra�enia grupowego.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - u�ywa pliku syntezy podanego zamiast bazy urpmi.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"wywo�anie zwrotne jest :\n"
-"%s\n"
+"  --media        - u�ywa tylko podanych no�nik�w, rozdzielonych "
+"przecinkami.\n"
+
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - u�ywa tylko no�nik�w aktualizacyjnych.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"u�ycie: urpmi.addmedia [opcje] <nazwa> <url> [with <�cie�ka wzgl�dna>]\n"
-"gdzie <url> mo�e przyjmowa� posta�\n"
-"       file://<�cie�ka>\n"
-"       ftp://<login>:<has�o>@<komputer>/<�cie�ka> with <wzgl�dna nazwa pliku "
-"hdlist>\n"
-"       ftp://<komputer>/<�cie�ka> with <wzlgl�dna nazwa pliku hdlist>\n"
-"       http://<komputer>/<�cie�ka> with <wzgl�dna nazwa pliku hdlist>\n"
-"       removable://<�cie�ka>\n"
+"urpmq wersja %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"To jest otwarte oprogramowanie i mo�e by� rozpowszechniane na zasadach "
+"licencji  GNU GPL.\n"
 "\n"
-"za� [opcje] mog� przyjmowa� warto�ci\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         - u�ywa wgeta do pobierania zdalnych plik�w.\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         - u�ywa curla do pobierania zdalnych plik�w.\n"
+"u�ycie:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   = ogranicza szybko�� pobierania.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "wszystko zosta�o ju� zainstalowane"
 
-#: ../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        - u�ywa wybranego po�rednika HTTP, domy�lnym portem\n"
-"                   jest port 1080 (format <serwerproxy[:port]>).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacja jest mo�liwa"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - okre�la u�ytkownika i has�o u�ywane przy autentykacji\n"
-"                   na serwerze po�rednicz�cym (format <u�ytkownik:has�o>)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacja nie powiod�a si�"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - tworzy no�nik aktualizacyjny.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Czy chesz spr�bowa� wymusi� instalacj� (--force)? (t/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - automatycznie tworzy wszystkie no�niki z no�nika\n"
-"                   instalacyjnego.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pr�bowa� instalowa� bez sprawdzania zale�no�ci? (t/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  - automatycznie tworzy no�nik dla cz�ci XXX dystrybucji,\n"
-"                   XXX mo�e mie� warto�� main, contrib, updates lub\n"
-"                   cokolwiek innego co zosta�o skonfigurowane ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "rozpowszechnianie %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --from         - u�ywa okre�lonego adresu url z listy mirror�w, domy�lnie\n"
-"                   %s\n"
+"Instalacja zako�czona niepowodzeniem, brakuje kilku plik�w:\n"
+"%s\n"
+"Mo�e zachodzi� potrzeba aktualizacji bazy danych urpmi"
 
-#: ../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"
-msgstr ""
-"  --version      - u�ywa okre�lonej wersji dystrybucji, domy�ln� wersj�\n"
-"                   jest wersja zainstalowanego pakietu mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - u�ywa okre�lonej architektury, domy�ln� jest\n"
-"                   architektura zinstalowanego pakietu mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Czy chcesz kontynuowa� instalacj� ?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - czy�ci katalog nag��wk�w pami�ci podr�cznej.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Nast�puj�ce pakiety zawieraj� niepoprawne podpisy"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr "  -h             - pr�buje odnale�� i u�y� pliku syntezy lub hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Naci�nij enter je�li jeste� gotowy(-a)..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - wymusza generacj� plik�w hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "W�� no�nik o nazwie \"%s\" do nap�du [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nie mo�na doda� aktualizacji dystrybucji cooker\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "nie mo�na pobra� pakiet�w �r�d�owych, zaniechanie"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"nie ma potrzeby podawania <�cie�ki_wzgl�dnej lub hdlisty> z opcj� --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nie mo�na zaktualizowa� no�nika \"%s\"\n"
+"Zostan� zainstalowane nast�puj�ce pakiety w celu spe�nienia zale�no�ci (%d "
+"MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Aby zainstalowa� nast�puj�ce zale�no�ci nale�y zrobi� to z konta roota:\n"
 "%s\n"
-"brak <�cie�ki wzgl�dnej do pliku hdlist>\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 ""
+"Poni�sze pakiety musz� by� usuni�te aby zaktualizowa� inne:\n"
 "%s\n"
-"brak znacznika \"with\" dla no�nika ftp\n"
+"zgadzasz si� ?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nie mo�na utworzy� no�nika \"%s\"\n"
+msgid "unrequested"
+msgstr "niezg�oszony"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"u�ycie: urpmi.removemedia [-a] <nazwa> ...\n"
-"gdzie <nazwa> jest nazw� no�nika do usuni�cia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "z powodu kolizji z pakietem %s"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - wybiera wszystkie no�niki.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "z powodu brakuj�cego %s"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nieznane opcje \"%s\"\n"
+msgid "due to unsatisfied %s"
+msgstr "z powodu niesatysfakcjonuj�cego pakietu %s"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "brak element�w do usuni�cia (u�yj urpmi.addmedia aby doda� no�nik)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "w celu zainstalowania pakietu %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 ""
-"brak wpisu do usuni�cia\n"
-"(jeden z %s)\n"
+"Niekt�re z wybranych pakiet�w nie mog� zosta� zainstalowane:\n"
+"%s\n"
+"zgadzasz si� ?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"u�ycie: urpmi.update [opcje] <nazwa> ...\n"
-"gdzie <nazwa> jest nazw� no�nika do aktualizacji.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Niestety, niepoprawny wyb�r, spr�buj ponownie\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - u�ywa tylko no�nik�w aktualizacyjnych.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Jaki jest Tw�j wyb�r? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - wybiera wszystkie niewymienne no�niki.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Wymagany jest jeden z nast�puj�cych pakiet�w:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - wymusza ca�kowite przeliczenie pliku depslist.ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jeden z poni�szych pakiet�w musi zosta� zainstalowany %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"brak element�w do aktualizacji (u�yj urpmi.addmedia aby doda� no�nik)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Tylko administrator ma prawo instalowa� pakiety"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"brak wpisu do aktualizacji\n"
-"(jeden z %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "u�ywaj�c okre�lonego �rodowiska na %s\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"
-msgstr ""
-"urpmi wersja %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"To jest oprogramowanie otwarte i mo�e by� rozpowszechniane na zasadach "
-"licencji GNU GPL.\n"
-"\n"
-"u�ycie:\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "nie mo�na utworzy� katalogu [%s] dla raportu o b��dach"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - u�ywa podanego pliku syntezy zamiast bazy urpmi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Co mo�na zrobi� z binarnymi plikami rpm przy u�yciu --instal-src"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automatycznie wybiera pakiety aktualizuj�ce system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nieznana opcja \"-%s\", sprawd� wywo�anie z opcj� --help\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - wymusza wyszukiwanie niesp�jno�ci (tak jak -y).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --src          - nast�pny pakiet jest pakietem �r�d�owym (tak jak -s).\n"
+"  nazwy lub pliki rpm podane w wierszu polece� zostan� zainstalowane.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instaluje tylko pakiet �r�d�owy (bez binari�w).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - tryb komunikatywny.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - zaczyna od usuwania plik�w rpm z pami�ci podr�cznej.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tryb cichy.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --noclean      - zachowuje pliki rpm nie u�ywane w pami�ci podr�cznej.\n"
+"  -s             - nast�pny pakiet jest pakietem �r�d�owym (tak jak --src).\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
-"  --force        - wymusza wywo�ywanie nawet przy braku niekt�rych "
-"pakiet�w.\n"
+"  -y             - wymusza wyszukiwanie niesp�jno�ci (tak jak --fuzzy).\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
-"  --allow-nodeps - umo�liwia u�ytkownikownikowi, kt�ry sobie za�yczy,\n"
-"                   instalacj� pakiet�w bez sprawdzania zale�no�ci.\n"
+"  -P             - nie przeszukuje serwer�w przy wyszukiwaniu pakiet�w.\n"
 
-#: ../urpmi_.c:86
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --allow-force  - umo�liwia u�ytkownikowi, kt�ry sobie tego za�yczy\n"
-"                   instalacj� pakiet�w bez sprawdzania zale�no�ci\n"
-"                   i sp�jno�ci.\n"
+"  -p             - umo�liwia wyszukiwanie serwer�w przy szukaniu pakiet�w.\n"
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - raport b��d�w w katalogu wskazanym przez\n"
-"                   nast�pny argument\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - wybiera wszystkie dopasowania w wierszu polece�.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - wy��cza �cie�ki oddzielone przecinkami.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --env          - u�ywa okre�lonego �rodowiska (typowo raport b��d�w).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - u�ywa interfejsu X Window.\n"
+"  --verify-rpm   - bada podpis cyfrowy pakietu przed instalacj�.\n"
+"                   (--no-verify-rpm wy��cza, domy�lnie w��czone).\n"
 
-#: ../urpmi_.c:101
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
@@ -1172,433 +1268,503 @@ msgstr ""
 "  --best-output  - wybiera najlepszy interfejs w zale�no�ci od �rodowiska:\n"
 "                   X Window lub tryb tekstowy.\n"
 
-#: ../urpmi_.c:103
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - u�ywa interfejsu X Window.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --verify-rpm   - bada podpis cyfrowy pakietu przed instalacj�.\n"
-"                   (--no-verify-rpm wy��cza, domy�lnie w��czone).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - wy��cza �cie�ki oddzielone przecinkami.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - wybiera wszystkie dopasowania w wierszu polece�.\n"
+"  --env          - u�ywa okre�lonego �rodowiska (typowo raport b��d�w).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  -p             - umo�liwia wyszukiwanie serwer�w przy szukaniu pakiet�w.\n"
+"  --bug          - raport b��d�w w katalogu wskazanym przez\n"
+"                   nast�pny argument\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  -P             - nie przeszukuje serwer�w przy wyszukiwaniu pakiet�w.\n"
+"  --proxy-user   - okre�la u�ytkownika i has�o u�ywane przy autentykacji\n"
+"                   na serwerze po�rednicz�cym (format <u�ytkownik:has�o>)\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\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 ""
-"  -y             - wymusza wyszukiwanie niesp�jno�ci (tak jak --fuzzy).\n"
+"  --proxy        - u�ywa wybranego po�rednika HTTP, domy�lnym portem\n"
+"                   jest port 1080 (format <serwerproxy[:port]>).\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - nast�pny pakiet jest pakietem �r�d�owym (tak jak --src).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   = ogranicza szybko�� pobierania.\n"
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tryb cichy.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - u�ywa curla do pobierania zdalnych plik�w.\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - tryb komunikatywny.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - u�ywa wgeta do pobierania zdalnych plik�w.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  nazwy lub pliki rpm podane w wierszu polece� zostan� zainstalowane.\n"
+"  --allow-force  - umo�liwia u�ytkownikowi, kt�ry sobie tego za�yczy\n"
+"                   instalacj� pakiet�w bez sprawdzania zale�no�ci\n"
+"                   i sp�jno�ci.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nieznana opcja \"-%s\", sprawd� wywo�anie z opcj� --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Co mo�na zrobi� z binarnymi plikami rpm przy u�yciu --instal-src"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - umo�liwia u�ytkownikownikowi, kt�ry sobie za�yczy,\n"
+"                   instalacj� pakiet�w bez sprawdzania zale�no�ci.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "nie mo�na utworzy� katalogu [%s] dla raportu o b��dach"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - wymusza wywo�ywanie nawet przy braku niekt�rych "
+"pakiet�w.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "u�ywaj�c okre�lonego �rodowiska na %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Tylko administrator ma prawo instalowa� pakiety"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr ""
+"  --noclean      - zachowuje pliki rpm nie u�ywane w pami�ci podr�cznej.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jeden z poni�szych pakiet�w musi zosta� zainstalowany %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - zaczyna od usuwania plik�w rpm z pami�ci podr�cznej.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Wymagany jest jeden z nast�puj�cych pakiet�w:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instaluje tylko pakiet �r�d�owy (bez binari�w).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Jaki jest Tw�j wyb�r? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - nast�pny pakiet jest pakietem �r�d�owym (tak jak -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Niestety, niepoprawny wyb�r, spr�buj ponownie\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - wymusza wyszukiwanie niesp�jno�ci (tak jak -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Niekt�re z wybranych pakiet�w nie mog� zosta� zainstalowane:\n"
-"%s\n"
-"zgadzasz si� ?"
+"  --auto-select  - automatycznie wybiera pakiety aktualizuj�ce system.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "w celu zainstalowania pakietu %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - u�ywa podanego pliku syntezy zamiast bazy urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "z powodu niesatysfakcjonuj�cego pakietu %s"
+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 wersja %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"To jest oprogramowanie otwarte i mo�e by� rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
+"\n"
+"u�ycie:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "z powodu brakuj�cego %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nie mo�na zaktualizowa� no�nika \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "z powodu kolizji z pakietem %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "niezg�oszony"
+msgid "unable to create medium \"%s\"\n"
+msgstr "nie mo�na utworzy� no�nika \"%s\"\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 ""
-"Poni�sze pakiety musz� by� usuni�te aby zaktualizowa� inne:\n"
 "%s\n"
-"zgadzasz si� ?"
+"brak znacznika \"with\" dla no�nika ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Zostan� zainstalowane nast�puj�ce pakiety w celu spe�nienia zale�no�ci (%d "
-"MB)"
+"%s\n"
+"brak <�cie�ki wzgl�dnej do pliku hdlist>\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 ""
-"Aby zainstalowa� nast�puj�ce zale�no�ci nale�y zrobi� to z konta roota:\n"
 "%s\n"
+"nie ma potrzeby podawania <�cie�ki_wzgl�dnej lub hdlisty> z opcj� --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "nie mo�na pobra� pakiet�w �r�d�owych, zaniechanie"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "pobieranie pliku rpm [%s] ..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% z %s gotowe, ETA = %s, szybko�� = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nie mo�na doda� aktualizacji dystrybucji cooker\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% gotowe, szybko�� = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nieznane opcje \"%s\"\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "W�� no�nik o nazwie \"%s\" do nap�du [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Naci�nij enter je�li jeste� gotowy(-a)..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Nast�puj�ce pakiety zawieraj� niepoprawne podpisy"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - wymusza generacj� plik�w hdlist.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Czy chcesz kontynuowa� instalacj� ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr "  -h             - pr�buje odnale�� i u�y� pliku syntezy lub hdlist.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (y/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - czy�ci katalog nag��wk�w pami�ci podr�cznej.\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 ""
-"Instalacja zako�czona niepowodzeniem, brakuje kilku plik�w:\n"
-"%s\n"
-"Mo�e zachodzi� potrzeba aktualizacji bazy danych urpmi"
+"  --arch         - u�ywa okre�lonej architektury, domy�ln� jest\n"
+"                   architektura zinstalowanego pakietu mandrake-release.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instalacja nie powiod�a si�"
+#: ../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      - u�ywa okre�lonej wersji dystrybucji, domy�ln� wersj�\n"
+"                   jest wersja zainstalowanego pakietu mandrake-release.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "rozpowszechnianie %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - u�ywa okre�lonego adresu url z listy mirror�w, domy�lnie\n"
+"                   %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pr�bowa� instalowa� bez sprawdzania zale�no�ci? (t/N) "
+#: ../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  - automatycznie tworzy no�nik dla cz�ci XXX dystrybucji,\n"
+"                   XXX mo�e mie� warto�� main, contrib, updates lub\n"
+"                   cokolwiek innego co zosta�o skonfigurowane ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Czy chesz spr�bowa� wymusi� instalacj� (--force)? (t/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatycznie tworzy wszystkie no�niki z no�nika\n"
+"                   instalacyjnego.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "wszystko zosta�o ju� zainstalowane"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - tworzy no�nik aktualizacyjny.\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 wersja %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"To jest otwarte oprogramowanie i mo�e by� rozpowszechniane na zasadach "
-"licencji  GNU GPL.\n"
+"u�ycie: urpmi.addmedia [opcje] <nazwa> <url> [with <�cie�ka wzgl�dna>]\n"
+"gdzie <url> mo�e przyjmowa� posta�\n"
+"       file://<�cie�ka>\n"
+"       ftp://<login>:<has�o>@<komputer>/<�cie�ka> with <wzgl�dna nazwa pliku "
+"hdlist>\n"
+"       ftp://<komputer>/<�cie�ka> with <wzlgl�dna nazwa pliku hdlist>\n"
+"       http://<komputer>/<�cie�ka> with <wzgl�dna nazwa pliku hdlist>\n"
+"       removable://<�cie�ka>\n"
 "\n"
-"usage:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - wypisuje dost�pne pakiety.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - wypisuje dost�pne no�niki.\n"
+"za� [opcje] mog� przyjmowa� warto�ci\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   - wypisuje dost�pne w�z�y gdy u�ywana jest opcja --"
-"parallel.\n"
+"brak wpisu do usuni�cia\n"
+"(jeden z %s)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases    - wypisuje dost�pne r�wnoleg�e aliasy.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "brak element�w do usuni�cia (u�yj urpmi.addmedia aby doda� no�nik)\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - wybiera wszystkie no�niki.\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      - wybiera nag��wki z pakietu wypisane z bazy danych urpmi\n"
-"                   na wyj�cie standardowe (tylko root).\n"
+"u�ycie: urpmi.removemedia [-a] <nazwa> ...\n"
+"gdzie <nazwa> jest nazw� no�nika do usuni�cia.\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      - wypisuje wszystkie pakiety �r�d�owe przed pobraniem\n"
-"                   (tylko root).\n"
+"brak wpisu do aktualizacji\n"
+"(jeden z %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - rozszerza zapytania o zale�no�ci mi�dzypakietowe.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"brak element�w do aktualizacji (u�yj urpmi.addmedia aby doda� no�nik)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - usuwa pakiet je�li jest ju� zainstalowana lepsza wersja.\n"
+"  -d             - wymusza ca�kowite przeliczenie pliku depslist.ordered.\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - zape�nia wyj�cie pakietami do usuni�cia.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - wybiera wszystkie niewymienne no�niki.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - wyszukiwanie odwrotne tego co wymaga pakietu.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - u�ywa tylko no�nik�w aktualizacyjnych.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - wy�wietla grupy wraz z ich nazwami.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"u�ycie: urpmi.update [opcje] <nazwa> ...\n"
+"gdzie <nazwa> jest nazw� no�nika do aktualizacji.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - wy�wietla wersj� i wydanie wraz z nazw�.\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes mo�e by� u�yta tylko z opcj� --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: nieznana opcja \"-%s\", sprawd� wywo�anie z opcj� --help\n"
+
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  ��danie dotycz�ce nazw lub plik�w podanych w wierszu polece�.\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes mo�e by� u�yta tylko z opcj� --parallel"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - wy�wietla wersj� i wydanie wraz z nazw�.\n"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf wersja %s"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - wy�wietla grupy wraz z ich nazwami.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - wyszukiwanie odwrotne tego co wymaga pakietu.\n"
 
-#: placeholder.h:20
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - zape�nia wyj�cie pakietami do usuni�cia.\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 ""
-"To jest otwarte oprogramowanie i mo�e by� rozprowadzane na zasadach licencji "
-"GNU GPL."
+"  -u             - usuwa pakiet je�li jest ju� zainstalowana lepsza wersja.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "U�ycie: urpmf [opcje] <plik>"
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - rozszerza zapytania o zale�no�ci mi�dzypakietowe.\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         - bez wy�wietlania nazwy znacznika\n"
-"(domy�lny tryb je�li nie podano znacznika w wierszu"
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                   polecenia, niezgodne z trybem interaktywnym)."
-
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - wy�wietla wszystkie znaczniki."
+"  --sources      - wypisuje wszystkie pakiety �r�d�owe przed pobraniem\n"
+"                   (tylko root).\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          - wy�wietla znacznik name: nazwa pliku rpm (tak�e gdy"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    nie podano nazwy pakietu lub znacznik bez nazwy)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - wy�wietla znacznik group: grupa."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - wy�wietla znacznik size: rozmiar."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - wy�wietla znacznik serial: numer."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - wy�wietla znacznik summary: zestawienie."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - wy�wietla znacznik description: opis."
+"  --headers      - wybiera nag��wki z pakietu wypisane z bazy danych urpmi\n"
+"                   na wyj�cie standardowe (tylko root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - wy�wietla zanacznik provides: (wszyst. pakiety)"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases    - wypisuje dost�pne r�wnoleg�e aliasy.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - wy�wietla znacznik requires: wszystkie zale�no�ci."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - wypisuje dost�pne w�z�y gdy u�ywana jest opcja --"
+"parallel.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - wy�wietla znacznik files: wszystkie pliki."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - wypisuje dost�pne no�niki.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr "  --conflicts     - wy�wietla znacznik conflicts: wszystkie konflikty."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - wypisuje dost�pne pakiety.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (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 ""
-"  --obsoletes     - wy�wietla znacznik obsoletes: wszystkie przestarza�e pak."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - wy�wietla znacznik prereqs: wszystkie wymagania."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "spr�buj urpmf --help aby uzyska� wi�cej opcji"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "nie mo�na odnale�� pe�nej listy no�nik�w"
+"urpmq wersja %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"To jest otwarte oprogramowanie i mo�e by� rozpowszechniane na zasadach "
+"licencji  GNU GPL.\n"
+"\n"
+"usage:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "b��d curl: wyj�cie z warto�ci� %d lub sygna�em %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Dla w�z�a %s instalacja nie powiod�a si�"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "brak programu rsync\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "b��d rshp, by� mo�e w�ze� jest nieosi�galny"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "b��d rsync: wyj�cie z warto�ci� %d lub sygna�em %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "b�ad mput, by� mo�e w�ze� jest nieosi�galny"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "brak ssh\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "w w�le %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "b��d sk�adni pliku konfiguracyjnego w wierszu %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "po��czenie scp z komputerem %s zako�czone niepowodzeniem"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "no�nik \"%s\" pr�buje u�ywa� wykorzystany ju� plik hdlist, zignorowano "
-#~ "no�nik"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "komputer %s nie posiada odpowiednie wersji urpmi"
 
 #~ msgid "ignoring option \"%s\" not used"
 #~ msgstr "ignorowana opcja \"%s\" nie zosta�a u�yta"
diff --git a/po/pt.po b/po/pt.po
index baea8f0c..c9501a5b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-pt\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-02-24 10:02+0000\n"
 "Last-Translator: Fernando Ribeiro <fa.ribeiro(at)gmx.net>\n"
 "Language-Team: Portugal\n"
@@ -20,1160 +20,1295 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "a instalar %s\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 "SsYy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf vers�o %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 "Este programa � livre e pode ser distribu�do sob a licen�a GNU GPL."
+
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "utiliza��o: urpmf [op��es] <ficheiro>"
+
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
-"Instala��o autom�tica de pacotes...\n"
-"Pediu a instala��o do pacote %s\n"
+"  --quiet         - n�o mostra o nome da marca (por omiss�o se nenhuma marca "
+"� dada na linha"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Est� bem assim?"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    de comando, incompat�vel com o modo interactivo)."
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - mostra todas as marcas."
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Cancelar"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - mostra a marca do nome: rpm filename (por omiss�o se "
+"nenhuma"
 
-#: ../_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 "Nn"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    marca foi metida na linha de comando)."
 
-#: ../_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 "SsYy"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - mostra a marca do grupo: group."
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (S/n) "
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - mostra a marca do tamanho: size."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - mostra a marca da s�rie: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - mostra a marca do resumo: summary."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - mostra a marca da descri��o: description."
 
-#: ../_irpm_.c:63
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - mostra a marca dos fornecidos: all provides (v�rias "
+"linhas)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - mostra a marca dos requeridos: all requires (v�rias "
+"linhas)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - mostra a marca dos ficheiros: all files (v�rias linhas)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - mostra a marca dos conflitos: all conflicts (v�rias "
+"linhas)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - mostra a marca dos obsoletos: all obsoletes (v�rias "
+"linhas)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - mostra a marca dos indispens�veis: all prereqs (v�rias "
+"linhas)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "tente urpmf --help para mais op��es"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "n�o foi encontrada nenhuma lista de m�dia completa"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: comando n�o encontrado\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Descarregador desconhecido `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocolo desconhecido definido para %s"
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "nenhum descarregador (nem curl nem wget) foi encontrado\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "imposs�vel utilizar o protocolo: %s"
+msgid "Is this OK?"
+msgstr "Est� bem assim?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "a c�pia falhou %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Instala��o autom�tica de pacotes...\n"
+"Pediu a instala��o do pacote %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "falta o wget\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "a instalar %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget falhou: saiu com %d ou o sinal %d\n"
+msgid "unable to open rpmdb"
+msgstr "imposs�vel abrir o rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "falta o curl\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "imposs�vel aceder ao ficheiro rpm [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"o m�dia \"%s\" tenta usar um ficheiro lista j� usado, vou ignorar o m�dia"
+msgid "%s conflicts with %s"
+msgstr "%s est� em conflito com %s"
 
-#: ../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 ""
-"imposs�vel de tomar em conta o m�dia \"%s\" pois o ficheiro lista j� � usado "
-"por outro m�dia"
+msgid "%s is needed by %s"
+msgstr "%s � necess�rio para %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"imposs�vel de utilizar o nome \"%s\" para o m�dia sem nome porque j� est� "
-"usado"
+msgid "unable to install package %s"
+msgstr "imposs�vel instalar o pacote %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"imposs�vel de tomar o m�dia \"%s\" em conta porque nenhum ficheiro de lista "
-"[%s] existe"
+msgid "unable to remove package %s"
+msgstr "imposs�vel remover o pacote %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "imposs�vel de determinar o m�dia do ficheiro hdlist [%s]"
+msgid "Preparing..."
+msgstr "A preparar..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
-"imposs�vel de aceder ao ficheiro hdlist de \"%s\", o m�dia vai ser ignorado"
+msgid "...retrieving failed: %s"
+msgstr "...o descarregamento falhou : %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"imposs�vel de aceder ao ficheiro lista de \"%s\", o m�dia vai ser ignorado"
+msgid "...retrieving done"
+msgstr "...descarregamento feito."
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "a tentar ignorar o m�dia \"%s\", a evitar"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "a descarregar os ficheiros rpm a partir do m�dia \"%s\"..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-"imposs�vel de encontrar o ficheiro hdlist para \"%s\", o m�dia vai ser "
-"ignorado"
+msgid "malformed input: [%s]"
+msgstr "entrada malformada : [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-"imposs�vel de encontrar o ficheiro lista para \"%s\", o m�dia � ignorado"
+msgid "unable to access medium \"%s\""
+msgstr "imposs�vel de aceder ao m�dia \"%s\""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "o ficheiro lista para \"%s\" � incoerente, o m�dia vai ser ignorado"
+msgid "urpmi database locked"
+msgstr "a base de dados urpmi est� cerrada"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "m�dia incoerente \"%s\" marcado como amov�vel mas n�o o � de facto"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "o m�dia \"%s\" n�o est� selecionado"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "imposs�vel de ler o ficheiro rpm [%s] do m�dia \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "package %s is not found."
+msgstr "o pacote %s n�o foi encontrado"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "o m�dia \"%s\" n�o define nenhum sitio para ficheiros rpm"
+
+#: ../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)"
 msgstr ""
-"incapaz de inspectar o ficheiro lista para \"%s\", o m�dia vai ser ignorado"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "h� demasiados pontos de montagem para o m�dia amov�vel \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "h� v�rios pacotes com o mesmo nome de ficheiro rpm \"%s\""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "a considerar o dispositivo amov�vel como \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "incapaz de percorrer bem [%s] no valor \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "a utilizar um dispositivo amov�vel diferente [%s] para \"%s\""
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes pacotes t�m %s: %s"
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "incapaz de tomar o caminho do m�dia amov�vel \"%s\""
+msgid "no package named %s"
+msgstr "nenhum pacote se chama %s"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "imposs�vel de escrever o ficheiro de configura��o [%s]"
+msgid "error registering local packages"
+msgstr "erro ao registar os pacotes locais"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "imposs�vel aceder ao ficheiro rpm [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "escreve o ficheiro de configura��o [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "a descarregar o ficheiro rpm [%s] ..."
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "imposs�vel de encontrar \"%s\" no ficheiro [%s]"
+msgid "invalid rpm file name [%s]"
+msgstr "o nome de ficheiro rpm n�o � v�lido [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "a examinar a pegada paralela no ficheiro [%s]"
+msgid "no entries relocated in depslist"
+msgstr "nenhuma entrada mudada na lista das depend�ncias"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "encontrei uma pegada paralela para os nodes %s"
+msgid "relocated %s entries in depslist"
+msgstr "mudei %s entradas na lista das depend�ncias"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "a utilizar o m�dia associado para o modo paralelo : %s"
+msgid "unmounting %s"
+msgstr "a desmontar %s"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "imposs�vel de a op��o paralela \"%s\""
+msgid "mounting %s"
+msgstr "a montar %s"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis n�o pode ser utilizado com --media, --update ou --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "a apagar %d cabe�alhos obsoletos no cache"
 
-#: ../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 "found %d headers in cache"
+msgstr "encontrei %d cabe�alhos no cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "constru� o ficheiro de s�ntese hdlist para o m�dia \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "a examinar o ficheiro hdlist [%s]"
 
-#: ../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]"
 msgstr "a examinar o ficheiro s�ntese [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problema ao ler o ficheiro hdlist do m�dia \"%s\""
+msgid "building hdlist [%s]"
+msgstr "a construir o hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "a ler os cabe�alhos do m�dia \"%s\""
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr "a passar uma segunda vez para calcular as depend�ncias\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema ao ler o ficheiro de s�ntese do m�dia \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "imposs�vel abrir o rpmdb"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "o m�dia \"%s\" j� existe"
+msgid "nothing written in list file for \"%s\""
+msgstr "nada de escrito no ficheiro lista para \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "adicionei o m�dia %s"
+msgid "writing list file for medium \"%s\""
+msgstr "a escrever o ficheiro de lista para o m�dia \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "imposs�vel de aceder ao primeiro m�dia de instala��o"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "imposs�vel de escrever o ficheiro lista de \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "a copiar o ficheiro hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "o ficheiro [%s] j� est� utilizado no mesmo m�dia \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...copia feita"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "imposs�vel de percorrer o ficheiro hdlist de \"%s\" "
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...copia feita"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "n�o encontrei um ficheiro hdlist para o m�dia \"%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)"
-msgstr ""
-"imposs�vel de aceder ao primeiro m�dia de instala��o (n�o achei os ficheiros "
-"Mandrake/base/hdlists)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "o descarregamento do hdlist (ou da s�ntese) falhou"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "a descarregar o ficheiro hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "a examinar o ficheiro MD5SUM"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...descarregamento feito."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "a copiar o hdlist (ou a s�ntese) de \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...o descarregamento falhou : %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "a descarregar a fonte hdlist (ou s�ntese) de \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descri��o hdlist \"%s\" inv�lida no ficheiro hdlists"
+msgid "retrieving description file of \"%s\"..."
+msgstr "a receber o ficheiro de descri��o de \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "a tentar seleccionar um m�dia \"%s\" que n�o existe"
+msgid "no rpm files found from [%s]"
+msgstr "nenhum ficheiro rpm encontrado em [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "incapaz de ler o ficheiros rpm de [%s] : %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "a escolher v�rios m�dias : %s"
+msgid "reading rpm files from [%s]"
+msgstr "o ler os ficheiros rpm de [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "a remover o m�dia \"%s\""
+msgid "...copying done"
+msgstr "...copia feita"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "a base de dados urpmi est� cerrada"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...copia feita"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "imposs�vel de aceder ao m�dia \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "a copiar a lista fonte de \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "a copiar o ficheiro de descri��o de \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "a copia de [%s] falhou"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "a copiar o hdlist (ou a s�ntese) de \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "a copia de [%s] falhou"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "a examinar o ficheiro MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "a copiar o ficheiro de descri��o de \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "a copiar a lista fonte de \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "a remover o m�dia \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "o ler os ficheiros rpm de [%s]"
+msgid "selecting multiple media: %s"
+msgstr "a escolher v�rios m�dias : %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "incapaz de ler o ficheiros rpm de [%s] : %s"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nenhum ficheiro rpm encontrado em [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "a tentar seleccionar um m�dia \"%s\" que n�o existe"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "a receber o ficheiro de descri��o de \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"imposs�vel de aceder ao primeiro m�dia de instala��o (n�o achei os ficheiros "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "a descarregar a fonte hdlist (ou s�ntese) de \"%s\"..."
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "o descarregamento do hdlist (ou da s�ntese) falhou"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descri��o hdlist \"%s\" inv�lida no ficheiro hdlists"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "n�o encontrei um ficheiro hdlist para o m�dia \"%s\""
+msgid "retrieving hdlists file..."
+msgstr "a descarregar o ficheiro hdlist..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "o ficheiro [%s] j� est� utilizado no mesmo m�dia \"%s\""
+msgid "copying hdlists file..."
+msgstr "a copiar o ficheiro hdlist..."
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "imposs�vel de percorrer o ficheiro hdlist de \"%s\" "
+msgid "unable to access first installation medium"
+msgstr "imposs�vel de aceder ao primeiro m�dia de instala��o"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "imposs�vel de escrever o ficheiro lista de \"%s\""
+msgid "added medium %s"
+msgstr "adicionei o m�dia %s"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "a escrever o ficheiro de lista para o m�dia \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "o m�dia \"%s\" j� existe"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nada de escrito no ficheiro lista para \"%s\""
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "a passar uma segunda vez para calcular as depend�ncias\n"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problema ao ler o ficheiro hdlist do m�dia \"%s\""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "a ler os cabe�alhos do m�dia \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis n�o pode ser utilizado com --media, --update ou --parallel"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "a construir o hdlist [%s]"
+msgid "unable to use parallel option \"%s\""
+msgstr "imposs�vel de a op��o paralela \"%s\""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "constru� o ficheiro de s�ntese hdlist para o m�dia \"%s\""
+msgid "using associated media for parallel mode: %s"
+msgstr "a utilizar o m�dia associado para o modo paralelo : %s"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "encontrei %d cabe�alhos no cache"
+msgid "found parallel handler for nodes: %s"
+msgstr "encontrei uma pegada paralela para os nodes %s"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "a apagar %d cabe�alhos obsoletos no cache"
+msgid "examining parallel handler in file [%s]"
+msgstr "a examinar a pegada paralela no ficheiro [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "a montar %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "imposs�vel de encontrar \"%s\" no ficheiro [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "a desmontar %s"
+msgid "write config file [%s]"
+msgstr "escreve o ficheiro de configura��o [%s]"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "mudei %s entradas na lista das depend�ncias"
+msgid "unable to write config file [%s]"
+msgstr "imposs�vel de escrever o ficheiro de configura��o [%s]"
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "nenhuma entrada mudada na lista das depend�ncias"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "incapaz de tomar o caminho do m�dia amov�vel \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "o nome de ficheiro rpm n�o � v�lido [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "a utilizar um dispositivo amov�vel diferente [%s] para \"%s\""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "a descarregar o ficheiro rpm [%s] ..."
+msgid "taking removable device as \"%s\""
+msgstr "a considerar o dispositivo amov�vel como \"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "imposs�vel aceder ao ficheiro rpm [%s]"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "h� demasiados pontos de montagem para o m�dia amov�vel \"%s\""
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "imposs�vel aceder ao ficheiro rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"incapaz de inspectar o ficheiro lista para \"%s\", o m�dia vai ser ignorado"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "erro ao registar os pacotes locais"
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "o ficheiro lista para \"%s\" � incoerente, o m�dia vai ser ignorado"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "nenhum pacote se chama %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+"imposs�vel de encontrar o ficheiro lista para \"%s\", o m�dia � ignorado"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes pacotes t�m %s: %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+"imposs�vel de encontrar o ficheiro hdlist para \"%s\", o m�dia vai ser "
+"ignorado"
 
-#: ../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\""
-msgstr "h� v�rios pacotes com o mesmo nome de ficheiro rpm \"%s\""
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "a tentar ignorar o m�dia \"%s\", a evitar"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "incapaz de percorrer bem [%s] no valor \"%s\""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+"imposs�vel de aceder ao ficheiro lista de \"%s\", o m�dia vai ser ignorado"
 
-#: ../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 "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
+"imposs�vel de aceder ao ficheiro hdlist de \"%s\", o m�dia vai ser ignorado"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "o m�dia \"%s\" n�o define nenhum sitio para ficheiros rpm"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "imposs�vel de determinar o m�dia do ficheiro hdlist [%s]"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "o pacote %s n�o foi encontrado"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"imposs�vel de tomar o m�dia \"%s\" em conta porque nenhum ficheiro de lista "
+"[%s] existe"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "o m�dia \"%s\" n�o est� selecionado"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"imposs�vel de utilizar o nome \"%s\" para o m�dia sem nome porque j� est� "
+"usado"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "imposs�vel de ler o ficheiro rpm [%s] do m�dia \"%s\""
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"imposs�vel de tomar em conta o m�dia \"%s\" pois o ficheiro lista j� � usado "
+"por outro m�dia"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "m�dia incoerente \"%s\" marcado como amov�vel mas n�o o � de facto"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"o m�dia \"%s\" tenta usar um ficheiro lista j� usado, vou ignorar o m�dia"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "entrada malformada : [%s]"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "o m�dia \"%s\" tenta utilizar uma hdlist j� usado, vai ser ignorado"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "a descarregar os ficheiros rpm a partir do m�dia \"%s\"..."
+msgid "syntax error in config file at line %s"
+msgstr "erro de sintaxe no ficheiro de configura��o na linha %s"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "A preparar..."
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completado, velocidade = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "imposs�vel remover o pacote %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% de %s completados, FIM = %s, velocidade = %s"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "imposs�vel instalar o pacote %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync falhou: saiu com %d ou o sinal %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s � necess�rio para %s"
+msgid "ssh is missing\n"
+msgstr "falta o ssh\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s est� em conflito com %s"
+msgid "rsync is missing\n"
+msgstr "falta o rsync\n"
 
-#: ../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 falhou, h� talvez um elemento fora de alcance"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl falhou: saiu com %d ou o sinal %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 falhou, h� talvez um elemento fora de alcance"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "falta o curl\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "no elemento %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget falhou: saiu com %d ou o sinal %d\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 "A instala��o falhou no elemento %s"
+msgid "wget is missing\n"
+msgstr "falta o wget\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 "A instala��o � poss�vel"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "a c�pia falhou %s"
 
-#: ../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 falhou no servidor %s"
+msgid "unable to handle protocol: %s"
+msgstr "imposs�vel utilizar o protocolo: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "o servidor %s n�o tem uma vers�o correcta de urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "nenhum descarregador (nem curl nem wget) foi encontrado\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 vers�o %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Este programa � livre e pode ser redistribu�do sob o termos da GPL GNU.\n"
-"\n"
-"utiliza��o:\n"
+msgid "unknown protocol defined for %s"
+msgstr "protocolo desconhecido definido para %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         - mostra esta mensagem de ajuda.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Descarregador desconhecido `%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - escolhe automaticamente um pacote quando necess�rio.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Imposs�vel apagar"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - verifica se a instala��o pode ser efectuada "
-"correctamente.\n"
+"Por forma a resolver as depend�ncias, ser�o apagados os seguintes pacotes (%"
+"d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi distribu�do atrav�s das m�quinas do ali�s.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "A verificar para remover os pacotes seguintes"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - escolhe todos os pacotes correspondentes � express�o.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nada a remover"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: op��o desconhecida \"-%s\", ver utiliza��o com --help\n"
+msgid "removing package %s will break your system"
+msgstr "remover o pacote %s vai arruinar o seu sistema"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "pacote desconhecido"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "pacotes desconhecidos"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "remover o pacote %s vai arruinar o seu sistema"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: op��o desconhecida \"-%s\", ver utiliza��o com --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Nada a remover"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - escolhe todos os pacotes correspondentes � express�o.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "A verificar para remover os pacotes seguintes"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi distribu�do atrav�s das m�quinas do ali�s.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Por forma a resolver as depend�ncias, ser�o apagados os seguintes pacotes (%"
-"d MB)"
+"  --test         - verifica se a instala��o pode ser efectuada "
+"correctamente.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Imposs�vel apagar"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - escolhe automaticamente um pacote quando necess�rio.\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         - mostra esta mensagem de ajuda.\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 vers�o %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"urpme vers�o %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Este programa � livre e pode ser redistribu�do sob o termos da GPL GNU.\n"
 "\n"
 "utiliza��o:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - utiliza s� os m�dia de actualiza��o.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"a chamada de retorno � :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"  --media        - utiliza s� os m�dia indicados, separados por virgulas.\n"
+"  )              - par�ntesis direito para fechar um grupo de express�es.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - usa a s�ntese indicada no lugar da bd urpmi.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  (              - par�ntesis esquerdo para abrir um grupo de express�es.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose      - modo detalhado.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
+"  !              - operador un�rio N�O, verdadeiro se a express�o � falsa.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - n�o mostra o nome da marca (por omiss�o se nenhuma "
-"marca\n"
-"                   � dada na linha de comando, incompat�vel com o modo "
-"interactivo).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - mostra todas as marcas.\n"
+"  -o             - operador bin�rio OU, verdadeiro se uma express�o � "
+"verdadeira.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name         - mostra a marca do nome : nome do rpm (por omiss�o se \n"
-"                   nenhuma marca � dada na linha de comando mas sem o nome "
-"do pacote).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - mostra a marca do grupo: group.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - mostra a marca do tamanho: size.\n"
+"  -a             - operador bin�rio E, verdadeiro se as duas express�es s�o "
+"verdadeiras.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - mostra a marca da �poca: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e            - inclui o c�digo perl directamente como perl -e.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - mostra a marca do resumo: summary.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - mostra a vers�o, o numero e a arquitectura com o nome.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - mostra a marca da descri��o: description.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i            - ignora a diferen�as de capitaliza��o.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides     - mostra a marca dos fornecidos: all provides (v�rias "
+"  --obsoletes     - mostra a marca dos obsoletos: all obsoletes (v�rias "
 "linhas).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires     - mostra a marca dos requeridos: all requires (v�rias "
+"  --conflicts    - mostra a marca dos conflitos: all conflicts (v�rias "
 "linhas).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 "  --files        - mostra a marca dos ficheiros: all files (v�rias linhas).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts    - mostra a marca dos conflitos: all conflicts (v�rias "
+"  --requires     - mostra a marca dos requeridos: all requires (v�rias "
 "linhas).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - mostra a marca dos obsoletos: all obsoletes (v�rias "
+"  --provides     - mostra a marca dos fornecidos: all provides (v�rias "
 "linhas).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i            - ignora a diferen�as de capitaliza��o.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - mostra a marca da descri��o: description.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - mostra a vers�o, o numero e a arquitectura com o nome.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - mostra a marca do resumo: summary.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e            - inclui o c�digo perl directamente como perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - mostra a marca da �poca: epoch.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - mostra a marca do tamanho: size.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - mostra a marca do grupo: group.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - operador bin�rio E, verdadeiro se as duas express�es s�o "
-"verdadeiras.\n"
+"  --name         - mostra a marca do nome : nome do rpm (por omiss�o se \n"
+"                   nenhuma marca � dada na linha de comando mas sem o nome "
+"do pacote).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - mostra todas as marcas.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - operador bin�rio OU, verdadeiro se uma express�o � "
-"verdadeira.\n"
+"  --quiet         - n�o mostra o nome da marca (por omiss�o se nenhuma "
+"marca\n"
+"                   � dada na linha de comando, incompat�vel com o modo "
+"interactivo).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  !              - operador un�rio N�O, verdadeiro se a express�o � falsa.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose      - modo detalhado.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  (              - par�ntesis esquerdo para abrir um grupo de express�es.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - usa a s�ntese indicada no lugar da bd urpmi.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  )              - par�ntesis direito para fechar um grupo de express�es.\n"
+"  --media        - utiliza s� os m�dia indicados, separados por virgulas.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"a chamada de retorno � :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - utiliza s� os m�dia de actualiza��o.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"utiliza��o : urpmi.addmedia [op��es] <nome> <url> [with <caminho_relativo>]\n"
-"onde <url> � do tipo\n"
-"       file://<caminho>\n"
-"       ftp://<nome>:<senha>@<servidor>/<path> with <caminho relativo do "
-"hdlist>\n"
-"       ftp://<servidor>/<caminho> with <caminho relativo do hdlist>\n"
-"       http://<servidor>/<caminho> with <caminho relativo do hdlist>\n"
-"       removable://<caminho>\n"
+"urpmf vers�o %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Este programa � livre e pode ser redistribu�do sob o termos da GPL GNU.\n"
 "\n"
-"e as [op��es] poss�veis s�o\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         - utiliza wget para descarregar os ficheiros distantes.\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         - utiliza o curl para descarregar os ficheiros distantes.\n"
+"utiliza��o:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limita a velocidade de descarga.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "j� est� tudo instalado"
 
-#: ../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        - utiliza o proxy HTTP indicado, o numero de porta �\n"
-"               1080 por omiss�o (o formato � <servidorproxy[:porta]>).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "A instala��o � poss�vel"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - indica o nome e a senha a utilizar para a\n"
-"       autentica��o no proxy (o formato � <nome:senha>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "A instala��o falhou"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - cria um m�dia de actualiza��o.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tentar a instala��o de forma mais insistente (--force)? (s/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - cria automaticamente todos os m�dias a partir de\n"
-"                   um m�dia de instala��o.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tentar a instala��o sem verificar depend�ncias? (s/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  - cria automaticamente o m�dia XXX duma distribui��o,\n"
-"                   XXX pode ser main, contrib, updates ou qualquer outro\n"
-"                   que tenha sido configurado ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "a distribuir %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --from         - utiliza a url indicada para a lista dos espelhos, por\n"
-"                   omiss�o � %s\n"
+"A instala��o falhou, faltam alguns ficheiros :\n"
+"%s\n"
+"Talvez queira actualizar a sua base de dados urpmi."
 
-#: ../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"
-msgstr ""
-"  --version      - utiliza a vers�o indicada, por omiss�o a vers�o do\n"
-"                   pacote mandrake-release instalado.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - utiliza a arquitectura indicada, por omiss�o a arch\n"
-"                   do pacote mandrake-release instalado.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Deseja continuar a instala��o?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - limpa a pasta cache dos cabe�alhos.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes pacotes t�m assinaturas erradas"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - tenta encontrar e utilizar um ficheiro de s�ntese ou\n"
-"                   hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Prima 'Enter' quando pronto..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - for�a a cria��o dos ficheiros hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor insira o media com o nome \"%s\" no dispositivo [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "N�o � poss�vel adicionar actualiza��es duma distribui��o cooker\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "imposs�vel obter pacotes fonte, a interromper"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"n�o � preciso indicar o <caminho relativo para hdlist> com --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "imposs�vel actualizar o m�dia \"%s\"\n"
+"Por forma a resolver as depend�ncias, ser�o instalados os seguintes pacotes "
+"(%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Necessita ser root para instalar as depend�ncias seguintes : \n"
 "%s\n"
-"<caminho relativo de hdlist> em falta\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 ""
+"Os seguintes pacotes t�m que ser removidos para que outros sejam "
+"actualizados:\n"
 "%s\n"
-"`with' em falta para m�dia ftp\n"
+"Aceita?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "imposs�vel criar o m�dia \"%s\"\n"
+msgid "unrequested"
+msgstr "n�o pedido"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"utiliza��o: urpmi.removemedia [-a] <nome> ...\n"
-"onde <nome> � o nome do m�dia a remover\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "devido a conflitos com %s"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selecciona todos os m�dias.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "devido a faltar %s"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"op��es desconhecidas '%s'\n"
+msgid "due to unsatisfied %s"
+msgstr "devido a n�o satisfazer %s"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nada a remover (use urpmi.addmedia para adicionar media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "para instalar %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 ""
-"a entrada a remover est� em falta\n"
-"(um de %s)\n"
+"Alguns pacotes pedidos n�o podem ser instalados :\n"
+"%s\n"
+"Aceita?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"utiliza��o: urpmi.update [op��es] <nome> ...\n"
-"onde <nome> � o nome do m�dia a actualizar.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, op��o incorrecta, tente de novo\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - utiliza s� os m�dias de actualiza��o.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Qual � a sua escolha? (1-%d)"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - selecciona todos os m�dias n�o amov�veis.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Um dos seguintes pacotes � necess�rio:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - for�a o calculo completo do ficheiro depslist.ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Um dos seguintes pacotes � necess�rio para a instala��o %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nada a actualizar (use urpmi.addmedia para adicionar um media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Apenas o SuperUtilizador pode instalar pacotes"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"a entrada a actualizar est� em falta\n"
-"(um de %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "utilizando o ambiente especificado em %s\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 "Imposs�vel criar a pasta [%s] para relatar o erro"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"urpmi vers�o %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Este programa � livre e pode ser redistribu�do sob o termos da GPL GNU.\n"
-"\n"
-"utiliza��o:\n"
+"O que pode ser feito com pacotes de rpm bin�rios quando se utiliza --install-"
+"src"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - usa a s�ntese indicada no lugar da bd urpmi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: op��o desconhecida \"-%s\", ver utiliza��o com --help\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "m� declara��o do proxy na linha de commando\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --auto-select  - selecciona automaticamente os pacotes para actualizar o "
-"sistema.\n"
+"  os nomes ou ficheiros rpm indicados na linha de comando v�o ser "
+"instalados.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - imp�e uma procura aproximada (o mesmo que -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modo detalhado.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - o pr�ximo pacote e um pacote fonte (o mesmo que -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modo silencioso.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instala s� os pacotes fonte (nenhum bin�rio).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - o pr�ximo pacote � um pacote fonte (o mesmo que --src).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - remove da cache os rpm antes de come�ar.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr ""
+"  -y             - imp�e uma procura aproximada (o mesmo que --fuzzy).\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - mant�m na cache os rpm n�o usados.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - n�o procura nos fornecidospara encontrar o pacotes.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --force        - for�a a execu��o mesmo se alguns pacotes n�o existem.\n"
+"  -p             - permite a procura em fornecidos para encontrar o pacote.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --allow-nodeps - pergunta ao utilizador se deseja instalar\n"
-"                   os pacotes sem verificar as depend�ncias.\n"
+"  -a             - escolhe todas as correspond�ncias da linha de comando.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - exclui os caminhos separados por virgulas.\n"
+
+#: ../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  - pergunta ao utilizador se deseja instalar\n"
-"                   os pacotes sem verificar as depend�ncias e integridade.\n"
+"  --verify-rpm   - verifica a assinatura do rpm antes de instalar.\n"
+"                   (--no-verify-rpm desactiva isto, activo por omiss�o).\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          - escreve um resumo de erro na pasta indicada\n"
-"                   no parametro seguinte.\n"
+"  --best-output  - escolhe o melhor interface de acordo com a\n"
+"                   sess�o: X ou modo de texto.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - utiliza o interface X.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1181,457 +1316,489 @@ msgstr ""
 "  --env          - utiliza um contexto particular (tipicamente um\n"
 "                   relat�rio de bug).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - utiliza o interface X.\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  - escolhe o melhor interface de acordo com a\n"
-"                   sess�o: X ou modo de texto.\n"
+"  --bug          - escreve um resumo de erro na pasta indicada\n"
+"                   no parametro seguinte.\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   - verifica a assinatura do rpm antes de instalar.\n"
-"                   (--no-verify-rpm desactiva isto, activo por omiss�o).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - exclui os caminhos separados por virgulas.\n"
+"  --proxy-user   - indica o nome e a senha a utilizar para a\n"
+"       autentica��o no proxy (o formato � <nome:senha>).\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\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 ""
-"  -a             - escolhe todas as correspond�ncias da linha de comando.\n"
+"  --proxy        - utiliza o proxy HTTP indicado, o numero de porta �\n"
+"               1080 por omiss�o (o formato � <servidorproxy[:porta]>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - permite a procura em fornecidos para encontrar o pacote.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limita a velocidade de descarga.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"  -P             - n�o procura nos fornecidospara encontrar o pacotes.\n"
+"  --curl         - utiliza o curl para descarregar os ficheiros distantes.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"  -y             - imp�e uma procura aproximada (o mesmo que --fuzzy).\n"
+"  --wget         - utiliza wget para descarregar os ficheiros distantes.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -s             - o pr�ximo pacote � um pacote fonte (o mesmo que --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modo silencioso.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modo detalhado.\n"
+"  --allow-force  - pergunta ao utilizador se deseja instalar\n"
+"                   os pacotes sem verificar as depend�ncias e integridade.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  os nomes ou ficheiros rpm indicados na linha de comando v�o ser "
-"instalados.\n"
+"  --allow-nodeps - pergunta ao utilizador se deseja instalar\n"
+"                   os pacotes sem verificar as depend�ncias.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: op��o desconhecida \"-%s\", ver utiliza��o com --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"O que pode ser feito com pacotes de rpm bin�rios quando se utiliza --install-"
-"src"
+"  --force        - for�a a execu��o mesmo se alguns pacotes n�o existem.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Imposs�vel criar a pasta [%s] para relatar o erro"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - mant�m na cache os rpm n�o usados.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "utilizando o ambiente especificado em %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Apenas o SuperUtilizador pode instalar pacotes"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - remove da cache os rpm antes de come�ar.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Um dos seguintes pacotes � necess�rio para a instala��o %s:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Um dos seguintes pacotes � necess�rio:"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instala s� os pacotes fonte (nenhum bin�rio).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual � a sua escolha? (1-%d)"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - o pr�ximo pacote e um pacote fonte (o mesmo que -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, op��o incorrecta, tente de novo\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - imp�e uma procura aproximada (o mesmo que -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Alguns pacotes pedidos n�o podem ser instalados :\n"
-"%s\n"
-"Aceita?"
+"  --auto-select  - selecciona automaticamente os pacotes para actualizar o "
+"sistema.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - usa a s�ntese indicada no lugar da bd urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "devido a n�o satisfazer %s"
+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 vers�o %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Este programa � livre e pode ser redistribu�do sob o termos da GPL GNU.\n"
+"\n"
+"utiliza��o:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "devido a faltar %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "imposs�vel actualizar o m�dia \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "devido a conflitos com %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "n�o pedido"
+msgid "unable to create medium \"%s\"\n"
+msgstr "imposs�vel criar o m�dia \"%s\"\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 ""
-"Os seguintes pacotes t�m que ser removidos para que outros sejam "
-"actualizados:\n"
 "%s\n"
-"Aceita?"
+"`with' em falta para m�dia ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Por forma a resolver as depend�ncias, ser�o instalados os seguintes pacotes "
-"(%d MB)"
+"%s\n"
+"<caminho relativo de hdlist> em falta\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 ""
-"Necessita ser root para instalar as depend�ncias seguintes : \n"
 "%s\n"
+"n�o � preciso indicar o <caminho relativo para hdlist> com --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "imposs�vel obter pacotes fonte, a interromper"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "a descarregar o ficheiro rpm [%s] ..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% de %s completados, FIM = %s, velocidade = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "N�o � poss�vel adicionar actualiza��es duma distribui��o cooker\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completado, velocidade = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"op��es desconhecidas '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor insira o media com o nome \"%s\" no dispositivo [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Prima 'Enter' quando pronto..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes pacotes t�m assinaturas erradas"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - for�a a cria��o dos ficheiros hdlist.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Deseja continuar a instala��o?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - tenta encontrar e utilizar um ficheiro de s�ntese ou\n"
+"                   hdlist.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (s/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - limpa a pasta cache dos cabe�alhos.\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 ""
-"A instala��o falhou, faltam alguns ficheiros :\n"
-"%s\n"
-"Talvez queira actualizar a sua base de dados urpmi."
+"  --arch         - utiliza a arquitectura indicada, por omiss�o a arch\n"
+"                   do pacote mandrake-release instalado.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "A instala��o falhou"
+#: ../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      - utiliza a vers�o indicada, por omiss�o a vers�o do\n"
+"                   pacote mandrake-release instalado.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "a distribuir %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - utiliza a url indicada para a lista dos espelhos, por\n"
+"                   omiss�o � %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tentar a instala��o sem verificar depend�ncias? (s/N) "
+#: ../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  - cria automaticamente o m�dia XXX duma distribui��o,\n"
+"                   XXX pode ser main, contrib, updates ou qualquer outro\n"
+"                   que tenha sido configurado ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tentar a instala��o de forma mais insistente (--force)? (s/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - cria automaticamente todos os m�dias a partir de\n"
+"                   um m�dia de instala��o.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "j� est� tudo instalado"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - cria um m�dia de actualiza��o.\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 vers�o %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Este programa � livre e pode ser redistribu�do sob o termos da GPL GNU.\n"
+"utiliza��o : urpmi.addmedia [op��es] <nome> <url> [with <caminho_relativo>]\n"
+"onde <url> � do tipo\n"
+"       file://<caminho>\n"
+"       ftp://<nome>:<senha>@<servidor>/<path> with <caminho relativo do "
+"hdlist>\n"
+"       ftp://<servidor>/<caminho> with <caminho relativo do hdlist>\n"
+"       http://<servidor>/<caminho> with <caminho relativo do hdlist>\n"
+"       removable://<caminho>\n"
 "\n"
-"utiliza��o:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - lista os pacotes dispon�veis.\n"
+"e as [op��es] poss�veis s�o\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - lista os m�dia dispon�veis.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"a entrada a remover est� em falta\n"
+"(um de %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - lista os n�s dispon�veis quando usa --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nada a remover (use urpmi.addmedia para adicionar media)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases   - lista os aliases paralelos dispon�veis.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selecciona todos os m�dias.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - extrai os cabe�alhos dos pacotes listados a partir da\n"
-"                   base de dados urpmi para stdout (s� root).\n"
+"utiliza��o: urpmi.removemedia [-a] <nome> ...\n"
+"onde <nome> � o nome do m�dia a remover\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      - indica todos os pacotes a instalar antes de os "
-"descarregar (se root).\n"
+"a entrada a actualizar est� em falta\n"
+"(um de %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - alarga a procura �s depend�ncias dos pacotes.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nada a actualizar (use urpmi.addmedia para adicionar um media)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - remove o pacote se uma vers�o mais recente j� est� "
-"instalada.\n"
+"  -d             - for�a o calculo completo do ficheiro depslist.ordered.\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - listagem completa dos pacotes a remover.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - selecciona todos os m�dias n�o amov�veis.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverte a procura para o que requer o pacote.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - utiliza s� os m�dias de actualiza��o.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - indica o grupo com o nome.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"utiliza��o: urpmi.update [op��es] <nome> ...\n"
+"onde <nome> � o nome do m�dia a actualizar.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - mostra a vers�o e o n�mero com o nome.\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes s� pode ser utilizado com --parallel"
+
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: � imposs�vel ler o ficheiro rpm \"%s\"\n"
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: op��o desconhecida \"-%s\", ver uso com --help\n"
+
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  os nomes ou os ficheiros rpm indicados na linha de comando s�o "
 "interrogados.\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes s� pode ser utilizado com --parallel"
-
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf vers�o %s"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - mostra a vers�o e o n�mero com o nome.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - indica o grupo com o nome.\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr "Este programa � livre e pode ser distribu�do sob a licen�a GNU GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverte a procura para o que requer o pacote.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "utiliza��o: urpmf [op��es] <ficheiro>"
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - listagem completa dos pacotes a remover.\n"
 
-#: placeholder.h:22
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --quiet         - n�o mostra o nome da marca (por omiss�o se nenhuma marca "
-"� dada na linha"
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    de comando, incompat�vel com o modo interactivo)."
+"  -u             - remove o pacote se uma vers�o mais recente j� est� "
+"instalada.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - mostra todas as marcas."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - alarga a procura �s depend�ncias dos pacotes.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --name          - mostra a marca do nome: rpm filename (por omiss�o se "
-"nenhuma"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    marca foi metida na linha de comando)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - mostra a marca do grupo: group."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - mostra a marca do tamanho: size."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - mostra a marca da s�rie: serial."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - mostra a marca do resumo: summary."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - mostra a marca da descri��o: description."
+"  --sources      - indica todos os pacotes a instalar antes de os "
+"descarregar (se root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --provides      - mostra a marca dos fornecidos: all provides (v�rias "
-"linhas)."
+"  --headers      - extrai os cabe�alhos dos pacotes listados a partir da\n"
+"                   base de dados urpmi para stdout (s� root).\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr ""
-"  --requires      - mostra a marca dos requeridos: all requires (v�rias "
-"linhas)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases   - lista os aliases paralelos dispon�veis.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --files         - mostra a marca dos ficheiros: all files (v�rias linhas)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - lista os n�s dispon�veis quando usa --parallel.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr ""
-"  --conflicts     - mostra a marca dos conflitos: all conflicts (v�rias "
-"linhas)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - lista os m�dia dispon�veis.\n"
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr ""
-"  --obsoletes     - mostra a marca dos obsoletos: all obsoletes (v�rias "
-"linhas)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - lista os pacotes dispon�veis.\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
-"  --prereqs       - mostra a marca dos indispens�veis: all prereqs (v�rias "
-"linhas)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "tente urpmf --help para mais op��es"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "n�o foi encontrada nenhuma lista de m�dia completa"
+"urpmq vers�o %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Este programa � livre e pode ser redistribu�do sob o termos da GPL GNU.\n"
+"\n"
+"utiliza��o:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl falhou: saiu com %d ou o sinal %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "A instala��o falhou no elemento %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "falta o rsync\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp falhou, h� talvez um elemento fora de alcance"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync falhou: saiu com %d ou o sinal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput falhou, h� talvez um elemento fora de alcance"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "falta o ssh\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "no elemento %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "erro de sintaxe no ficheiro de configura��o na linha %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp falhou no servidor %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr "o m�dia \"%s\" tenta utilizar uma hdlist j� usado, vai ser ignorado"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "o servidor %s n�o tem uma vers�o correcta de urpmi"
 
 #~ msgid "ignoring option \"%s\" not used"
 #~ msgstr "iignorando a op��o \"%s\" n�o usada"
@@ -1661,12 +1828,6 @@ msgstr "n�o foi encontrada nenhuma lista de m�dia completa"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - mostra esta mensagem de ajuda.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: op��o desconhecida \"-%s\", ver uso com --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: � imposs�vel ler o ficheiro rpm \"%s\"\n"
-
 #~ msgid "unable to build synthesis file for medium \"%s\""
 #~ msgstr "imposs�vel de construir o ficheiro de s�ntese do m�dia \"%s\""
 
@@ -1755,9 +1916,6 @@ msgstr "n�o foi encontrada nenhuma lista de m�dia completa"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "m� declara��o do proxy na linha de commando\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr ""
 #~ "uso: urpmi.addmedia [op��es] <nome> <url> [with  <caminho-relativo>]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5dc919c1..5989ba7f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,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: 2002-12-14 03:10GMT\n"
 "Last-Translator: Carlos Roberto Mafra <crmafra@mafra.eti.br>\n"
 "Language-Team: Brazilian Portuguese <C@li.org>\n"
@@ -16,1150 +16,1275 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instalando %s\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 "SsYy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf vers�o %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Instala��o autom�tica de pacotes...\n"
-"Voc� pediu a instala��o do pacote %s\n"
+"Este software � livre e pode ser redistribuido sob os termos da Licensa "
+"P�blica Geral (GPL), do GNU."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Tudo bem?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "utiliza��o: urpmf [op��es] <arquivo>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - n�o imprime nenhuma tag (defalut, se nenhuma tag dada no "
+"comando"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Cancelar"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    linha, incompat�vel com modo interativo)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --tudo           - imprime todas as tags."
 
-#: ../_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 "SsYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - imprime o nome da tag: rpm nome-do-arquivo (suposto, se "
+"nenhuma tag no"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (S/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
+"                    linha de comando, por�m sem nenhum nome de pacote)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --grupo         - imprime a tag grupo: grupo."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - imprime a tag tamanho: tamanho."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - imprime a tag serial: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - imprime a tag sum�rio: sum�rio."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - imprime a tag descri��o: descri��o."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - imprime a tag fornece: tudo fornece (m�ltiplas linhas)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+" --requires      - imprime a tag necessita: tudo necessita "
+"(m�ltiplas                           linhas)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --arquivos         - imprime a tag arquivos: tudo arquivos (m�ltiplas "
+"linhas)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflita     - imprime a tag conflita: tudo conflita (m�ltiplas linhas)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletos     - imprime a tag obsoletos: tudo obsoletos (m�ltiplas "
+"linhas)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - imprime a tag prereqs: tudo prereqs (m�ltiplas linhas)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "Tente urpmf --help para mais op��es"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "Nenhuma lista completa de m�dia foi encontrada"
 
-#: ../_irpm_.c:63
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: comando n�o encontrado\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch desconhecido`%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocolo desconhecido definido para %s"
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "no webfetch (curl or wget currently) found\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "Incapaz de usar protocolo: %s"
+msgid "Is this OK?"
+msgstr "Tudo bem?"
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "C�pia falhou"
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Instala��o autom�tica de pacotes...\n"
+"Voc� pediu a instala��o do pacote %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget est� faltando\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instalando %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget falhou: saido com %d ou sinal %d\n"
+msgid "unable to open rpmdb"
+msgstr "N�o foi poss�vel abrir rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl est� faltando\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "Incapaz de acessar arquivo rpm [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "m�dia \"%s\" tentou usar uma lista j� usada, m�dia ignorada."
+msgid "%s conflicts with %s"
+msgstr "%s conflita com %s"
 
-#: ../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 ""
-"Incapaz de lidar com a m�dia \"%s\" porque o arquivo est� sendo usado por "
-"outra m�dia"
+msgid "%s is needed by %s"
+msgstr "%s � requerido por %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"N�o consegui usar nome \"%s\" para m�dia n�o-nomeada, porque j� est� em uso."
+msgid "unable to install package %s"
+msgstr "N�o foi poss�vel instalar o pacote %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"N�o consegui usar a m�dia \"%s\" porque nenhum arquivo lista [%s] existe."
+msgid "unable to remove package %s"
+msgstr "n�o foi poss�vel remover o pacote %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "N�o consegui determinar a m�dia deste arquivo hdlist [%s]"
+msgid "Preparing..."
+msgstr "Preparando..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "N�a consegui acessar o arquivo hdlist de \"%s\", m�dia ignorada"
+msgid "...retrieving failed: %s"
+msgstr "Aquisi��o falhou: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "N�o consegui acessar lista de \"%s\", m�dia ignorada."
+msgid "...retrieving done"
+msgstr "..aquisi��o completa"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "Tentando contornar m�dia existente \"%s\", evitando"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "Adquirindo os arquivos rpm da m�dia \"%s\"..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "N�o consegui encontrar arquivo hdlist para \"%s\", m�dia ignorada."
+msgid "malformed input: [%s]"
+msgstr "Entrada mal constru�da: [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "N�o consegui encontrar a lista para \"%s\", m�dia ignorada."
+msgid "unable to access medium \"%s\""
+msgstr "Incapaz de acessar m�dia \"%s\""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "Incorente lista de arquivos para \"%s\", m�dia ignorada"
+msgid "urpmi database locked"
+msgstr "Base de dados urpmi trancada."
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "N�o consegui inspecionar a lista de arquivos \"%s\", m�dia ignorada"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "M�dia incoerente \"%s\" marcada como remov�vel, por�m n�o �."
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "Muitos pontos de montagem para a m�dia remov�vel \"%s\""
+msgid "medium \"%s\" is not selected"
+msgstr "M�dia \"%s\" n�o est� selecionada"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tirando dispositivos remov�veis como \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "N�o consegui ler o arquivo rpm [%s] para a m�dia \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Usando diferentes dispositivos remov�veis [%s] para \"%s\""
+msgid "package %s is not found."
+msgstr "Pacote  %s n�o encontrado."
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "N�o consegui adquirir caminhos para m�dia remov�vel \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "a m�dia \"%s\" n�o define uma localiza��o para arquivos rpm"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "N�o consegui escrever arquivo config [%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:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "Escreve o arquivo config [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "Existem m�ltiplos pacotes com o mesmo nome rpm \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "incapaz de processar \"%s\" no arquivo [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "N�o consegui ler corretamente [%s] no valor \"%s\""
 
-#: ../urpm.pm_.c:766
-#, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "Examinando download paralelo do arquivo [%s]"
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes pacotes cont�m %s: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
+#, c-format
+msgid "no package named %s"
+msgstr "Nenhum nome de pacote %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr "Erro registrando pacotes locais"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "� poss�vel download paralelo para os nodes: %s"
+msgid "unable to register rpm file"
+msgstr "Incapaz de acessar arquivo rpm [%s]"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "usando a m�dia associada para o modo paralelo : %s"
+msgid "retrieving rpm file [%s] ..."
+msgstr "Adquirindo o arquivo rpm [%s]...."
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "incapaz de usar op��o paralela \"%s\""
+msgid "invalid rpm file name [%s]"
+msgstr "Nome rpm inv�lido [%s]"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis n�o pode ser usada com --media, --update ou --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr "Nenhuma entrada realocada em depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "entradas %s realocadas na depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "Desmontando %s"
 
-#: ../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 "mounting %s"
+msgstr "Montando %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "Removendo %d cabe�alhos obsoletos no cache."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "Encontrado %d cabe�alhos no cache."
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "Constru�do arquivo hdlist s�ntese para m�dia \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "Examinando arquivo hdlist [%s]"
 
-#: ../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]"
 msgstr "Examinando arquivo s�ntese [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problema ao ler o arquivo hdlist da m�dia \"%s\""
+msgid "building hdlist [%s]"
+msgstr "Construindo hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "Lendo cabe�alhos da m�dia \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "fazendo segundo passo para calcular depend�ncias\n"
 
-#: ../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\""
 msgstr "Problema lendo arquivo s�ntese da m�dia \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "N�o foi poss�vel abrir rpmdb"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "M�dia \"%s\" j� existe"
+msgid "nothing written in list file for \"%s\""
+msgstr "Nada escrito na lista para \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "M�dia adicionada %s"
+msgid "writing list file for medium \"%s\""
+msgstr "Escrevendo a lista de arquivos para a m�dia \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "N�o consegui acessar a primeira m�dia de instala��o."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "incapaz de criar m�dia \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "Copiando arquivo hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "arquivo [%s] j� est� em uso no mesmo meio \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "..c�pa feita"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Incapaz de atualizar arquivo hdlist  de \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "..c�pa feita"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "Nenhum arquivo hdlist encontrado para a m�dia \"%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)"
-msgstr ""
-"N�o consegui acessar primeira m�dia de instala��o (nenhum arquivo base/"
-"hdlist Mandrake encontrado)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "Aquisi��o da fonte hdlist (ou s�ntese) falhou"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "Adquirindo arquivo hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "Examinando arquivo MD5SUM"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "..aquisi��o completa"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "copiando fonte hdlist (ou s�ntese) de \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "Aquisi��o falhou: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "Adquirindo a fonte hdlist (ou a s�ntese) de \"%s\"..."
 
-#: ../urpm.pm_.c:975
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "Descri��o inv�lida \"%s\" no arquivo hdlists"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving description file of \"%s\"..."
+msgstr "Conseguindo o arquivo de descri��o para \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "Tentando selecionar m�dia inexistente \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nenhum arquivo rpm encontrado em [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "n�o consegui ler arquivos rpm de: [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "selecionando m�ltiplas m�dias: %s"
+msgid "reading rpm files from [%s]"
+msgstr "lendo arquivos rpms de [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "Removendo a m�dua \"%s\""
+msgid "...copying done"
+msgstr "..c�pa feita"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "Base de dados urpmi trancada."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "..c�pa feita"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Incapaz de acessar m�dia \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "Copiando a lista fonte de \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "Copiando o arquivo de descri��o de \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "c�pia de [%s] falhou"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copiando fonte hdlist (ou s�ntese) de \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "c�pia de [%s] falhou"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "Examinando arquivo MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "Copiando o arquivo de descri��o de \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "Copiando a lista fonte de \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "Removendo a m�dua \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "lendo arquivos rpms de [%s]"
+msgid "selecting multiple media: %s"
+msgstr "selecionando m�ltiplas m�dias: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "n�o consegui ler arquivos rpm de: [%s]: %s"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nenhum arquivo rpm encontrado em [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "Tentando selecionar m�dia inexistente \"%s\""
 
-#: ../urpm.pm_.c:1285
-#, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "Conseguindo o arquivo de descri��o para \"%s\"..."
+#: ../urpm.pm:1
+#, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"N�o consegui acessar primeira m�dia de instala��o (nenhum arquivo base/"
+"hdlist Mandrake encontrado)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "Adquirindo a fonte hdlist (ou a s�ntese) de \"%s\"..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "Descri��o inv�lida \"%s\" no arquivo hdlists"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "Aquisi��o da fonte hdlist (ou s�ntese) falhou"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieving hdlists file..."
+msgstr "Adquirindo arquivo hdlist..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "Nenhum arquivo hdlist encontrado para a m�dia \"%s\""
+msgid "copying hdlists file..."
+msgstr "Copiando arquivo hdlist..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "arquivo [%s] j� est� em uso no mesmo meio \"%s\""
+msgid "unable to access first installation medium"
+msgstr "N�o consegui acessar a primeira m�dia de instala��o."
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Incapaz de atualizar arquivo hdlist  de \"%s\""
+msgid "added medium %s"
+msgstr "M�dia adicionada %s"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "incapaz de criar m�dia \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "M�dia \"%s\" j� existe"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "Escrevendo a lista de arquivos para a m�dia \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problema ao ler o arquivo hdlist da m�dia \"%s\""
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "Nada escrito na lista para \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis n�o pode ser usada com --media, --update ou --parallel"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "fazendo segundo passo para calcular depend�ncias\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "incapaz de usar op��o paralela \"%s\""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "Lendo cabe�alhos da m�dia \"%s\""
+msgid "using associated media for parallel mode: %s"
+msgstr "usando a m�dia associada para o modo paralelo : %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "� poss�vel download paralelo para os nodes: %s"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "Examinando download paralelo do arquivo [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "Construindo hdlist [%s]"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "incapaz de processar \"%s\" no arquivo [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "Constru�do arquivo hdlist s�ntese para m�dia \"%s\""
+msgid "write config file [%s]"
+msgstr "Escreve o arquivo config [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "Encontrado %d cabe�alhos no cache."
+msgid "unable to write config file [%s]"
+msgstr "N�o consegui escrever arquivo config [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "Removendo %d cabe�alhos obsoletos no cache."
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "N�o consegui adquirir caminhos para m�dia remov�vel \"%s\""
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "Montando %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "Usando diferentes dispositivos remov�veis [%s] para \"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "Desmontando %s"
+msgid "taking removable device as \"%s\""
+msgstr "tirando dispositivos remov�veis como \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "entradas %s realocadas na depslist"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "Muitos pontos de montagem para a m�dia remov�vel \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "Nenhuma entrada realocada em depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "N�o consegui inspecionar a lista de arquivos \"%s\", m�dia ignorada"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "Nome rpm inv�lido [%s]"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "Incorente lista de arquivos para \"%s\", m�dia ignorada"
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "Adquirindo o arquivo rpm [%s]...."
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "N�o consegui encontrar a lista para \"%s\", m�dia ignorada."
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "Incapaz de acessar arquivo rpm [%s]"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "N�o consegui encontrar arquivo hdlist para \"%s\", m�dia ignorada."
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "Incapaz de acessar arquivo rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "Tentando contornar m�dia existente \"%s\", evitando"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "Erro registrando pacotes locais"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "N�o consegui acessar lista de \"%s\", m�dia ignorada."
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "Nenhum nome de pacote %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "N�a consegui acessar o arquivo hdlist de \"%s\", m�dia ignorada"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes pacotes cont�m %s: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "N�o consegui determinar a m�dia deste arquivo hdlist [%s]"
 
-#: ../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\""
-msgstr "Existem m�ltiplos pacotes com o mesmo nome rpm \"%s\""
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"N�o consegui usar a m�dia \"%s\" porque nenhum arquivo lista [%s] existe."
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "N�o consegui ler corretamente [%s] no valor \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"N�o consegui usar nome \"%s\" para m�dia n�o-nomeada, porque j� est� em uso."
 
-#: ../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)"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"Incapaz de lidar com a m�dia \"%s\" porque o arquivo est� sendo usado por "
+"outra m�dia"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "a m�dia \"%s\" n�o define uma localiza��o para arquivos rpm"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "m�dia \"%s\" tentou usar uma lista j� usada, m�dia ignorada."
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "Pacote  %s n�o encontrado."
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "M�dia \"%s\" tentou usar uma hdlist j� usada, m�dia ignorada."
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "M�dia \"%s\" n�o est� selecionada"
+msgid "syntax error in config file at line %s"
+msgstr "Erro de sintaxe no config file na linha %s"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "N�o consegui ler o arquivo rpm [%s] para a m�dia \"%s\""
+msgid "        %s%% completed, speed = %s"
+msgstr "      %s%% completo, velocidade = %s"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "M�dia incoerente \"%s\" marcada como remov�vel, por�m n�o �."
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "      %s%% de %s completo, ETA = %s, velocidade = %s"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "Entrada mal constru�da: [%s]"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync falhou: saiu com %d ou sinal %d\n"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "Adquirindo os arquivos rpm da m�dia \"%s\"..."
+msgid "ssh is missing\n"
+msgstr "ssh est� faltando\n"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Preparando..."
-
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "n�o foi poss�vel remover o pacote %s"
+msgid "rsync is missing\n"
+msgstr "rsync est� faltando\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "N�o foi poss�vel instalar o pacote %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl falhou: saiu com %d ou sinal %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s � requerido por %s"
+msgid "curl is missing\n"
+msgstr "curl est� faltando\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s conflita com %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget falhou: saido com %d ou sinal %d\n"
 
-#: ../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 falhou, talvez o destino esteja inalcan��vel"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr "wget est� faltando\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 falhou, talvez o destino esteja inalcan��vel"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "C�pia falhou"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "unable to handle protocol: %s"
+msgstr "Incapaz de usar protocolo: %s"
 
-#: ../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 "Instala��o falhou no n�dulo %s"
-
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-msgid "Installation is possible"
-msgstr "Instala��o � poss�vel"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "no webfetch (curl or wget currently) found\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 falhou no host %s"
+msgid "unknown protocol defined for %s"
+msgstr "protocolo desconhecido definido para %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "servidor %s n�o tem uma vers�o compat�vel do urpmi"
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Webfetch desconhecido`%s' !!!\n"
 
-#: ../urpme_.c:39
+#: ../urpme: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 ""
-"urpmi vers�o %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Este � um software livre, e pode ser redistribu�do sob os termos da GPL, "
-"GNU.\n"
-"\n"
-"uso:\n"
-
-#: ../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         - imprime esta mensagem de ajuda.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automaticamente seleciona um pacote, em escolhas.\n"
+msgid "Removing failed"
+msgstr "A remo��o falhou"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - verifica se a instala��o pode ser efetuada corretamente.\n"
+"Para satisfazer as depend�ncias, os seguintes pacotes ser�o removidos (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi distribu�do .\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Verificando para remover os seguintes pacotes"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - seleciona todos os pacotes que combinam com a express�o.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nada para remover"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: op��o desconhecida \"-%s\", cheque o uso com --help\n"
+msgid "removing package %s will break your system"
+msgstr "a remo��o do pacote %s ir� danificar seu sistema"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "pacote desconhecido."
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "pacotes desconhecidos."
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "a remo��o do pacote %s ir� danificar seu sistema"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: op��o desconhecida \"-%s\", cheque o uso com --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Nada para remover"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - seleciona todos os pacotes que combinam com a express�o.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Verificando para remover os seguintes pacotes"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi distribu�do .\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Para satisfazer as depend�ncias, os seguintes pacotes ser�o removidos (%d MB)"
+"  --test         - verifica se a instala��o pode ser efetuada corretamente.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "A remo��o falhou"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automaticamente seleciona um pacote, em escolhas.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - imprime esta mensagem de ajuda.\n"
+
+#: ../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 vers�o %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
+"urpmi vers�o %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Este � um software livre, e pode ser redistribu�do sob os termos da GPL, "
 "GNU.\n"
 "\n"
 "uso:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - use somente m�dia update.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - use somente a m�dia listada em aspas.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - par�nteses direito para fechar um grupo de express�o.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"  --synthesis    - usa a s�ntese dada ao inv�s do banco de dados urpmi.\n"
+"  (              - par�nteses esquerdo para abrir grupo de express�o.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose       - modo verbose.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
+"  !              - operador un�rio N�O, verdadeiro se a express�o � falsa.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - n�o imprime nenhuma tag (defalut, se nenhuma tag dada na "
-"linha de\n"
-"                   comando, incompat�vel com modo interativo).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - imprime todas as tags\n"
+"  -o             - operador bin�rio OU, verdadeiro se uma express�o for "
+"verdadeira.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - imprime o nome da tag: rpm nome-do-arquivo (suposto, "
-"se \n"
-"                   nenhuma tag na linha de comando e sem nome do pacote).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - imprime a tag grupo: group. \n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - imprime a tag tamanho: size.\n"
+"  -a             - operador bin�rio E, verdadeiro se ambas express�es s�o "
+"verdadeiras.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch         - imprime a tag da �poca: epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inclui o c�digo perl diretamente como perl -e.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - imprime a tag sum�rio: summary.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - imprime vers�o, release e 'arch', com nome.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - imprime a tag descri��o: description.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignora a distin��o de caixa em tudo.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - imprime a tag dos fornecidos: all provides (m�ltiplas "
+"  --obsoletes    - imprime a tag obsoletos: all obsoletes (m�ltiplas "
 "linhas).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-" --requires      - imprime a tag requeridos: all requires (m�ltiplas "
+"  --conflicts    - imprime a tag conflitos: all conflicts (m�ltiplas "
 "linhas).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 " --files         - imprime a tag arquivos: all files (m�ltiplas linhas).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts    - imprime a tag conflitos: all conflicts (m�ltiplas "
+" --requires      - imprime a tag requeridos: all requires (m�ltiplas "
 "linhas).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes    - imprime a tag obsoletos: all obsoletes (m�ltiplas "
+"  --provides      - imprime a tag dos fornecidos: all provides (m�ltiplas "
 "linhas).\n"
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignora a distin��o de caixa em tudo.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - imprime a tag descri��o: description.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - imprime vers�o, release e 'arch', com nome.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - imprime a tag sum�rio: summary.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inclui o c�digo perl diretamente como perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch         - imprime a tag da �poca: epoch.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - imprime a tag tamanho: size.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - imprime a tag grupo: group. \n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - operador bin�rio E, verdadeiro se ambas express�es s�o "
-"verdadeiras.\n"
+"  --name          - imprime o nome da tag: rpm nome-do-arquivo (suposto, "
+"se \n"
+"                   nenhuma tag na linha de comando e sem nome do pacote).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - imprime todas as tags\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - operador bin�rio OU, verdadeiro se uma express�o for "
-"verdadeira.\n"
+"  --quiet         - n�o imprime nenhuma tag (defalut, se nenhuma tag dada na "
+"linha de\n"
+"                   comando, incompat�vel com modo interativo).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr ""
-"  !              - operador un�rio N�O, verdadeiro se a express�o � falsa.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose       - modo verbose.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  (              - par�nteses esquerdo para abrir grupo de express�o.\n"
+"  --synthesis    - usa a s�ntese dada ao inv�s do banco de dados urpmi.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - par�nteses direito para fechar um grupo de express�o.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - use somente a m�dia listada em aspas.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - use somente m�dia update.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"uso: urpmi.addmedia [op��es] <nome> <url> [with <caminho_relativo>]\n"
-"onde <url> � uma de\n"
-"       file://<caminho>\n"
-"       ftp://<login>:<senha>@<host>/<caminho> with <nome relativo de "
-"hdlist>\n"
-"       ftp://<host>/<path> with <nome relativo de hdlist>\n"
-"       http://<host>/<path> with <nome relativo de hdlist>\n"
-"       removable://<caminho>\n"
+"urpmf vers�o %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Este � um software livre, e pode ser redistribu�do sob os termos da GPL, "
+"GNU.\n"
 "\n"
-"e [op��es] s�o de\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         - usa wget para adquirir arquivos distantes.\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         - usa curl para adquirir arquivos distantes.\n"
+"uso:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "   --limit-rate   - limita a velocidade do download.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "tudo j� instalando"
 
-#: ../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        - usa o proxy HTTP especificado, o n�mero da porta\n"
-"                   � 1080 por default (o formato � <proxyhost[:port]>).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Instala��o � poss�vel"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - especifica usu�rio e senha para usar na autentica��o\n"
-"                   do proxy (o formato � <usu�rio:senha>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instala��o falhou"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - cria uma m�dia de atualiza��o.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tentar instalar com ainda mais for�a (--force)? (s/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - automaticamente cria todas as m�dias de uma m�dia\n"
-"                   de instala��o.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tentar instalar sem checar as depend�ncias? (s/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  -cria automaticamente a m�dia para a parte XXX \n"
-"                        de uma distribui��o, XXX pode ser principal, "
-"atualiza��es ou \n"
-"                         qualquer outro que tenha sido configurado\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distribuindo %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --from          - usa um endere�o url espec�fico como lista de mirrors, o "
-"padr�o �\n"
-"                   %s\n"
+"Instala��o falhou, alguns arquivos est�o faltando:.\n"
+"%s\n"
+"Voc� deve atualizar a sua base de dados urpmi"
 
-#: ../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"
-msgstr ""
-"  --version      - usa a vers�o especificada, o padr�o � a vers�o do\n"
-"                   pacote mandrake-release instalado.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - usa a arquitetura especificada, o padr�o � a arquitetura "
-"do\n"
-"                   pacote mandrake-release instalado.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Voc� deseja continuar com a instala��o ?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - limpa o diret�rio dos cabe�alhos de cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes pacotes cont�m assinaturas erradas"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - tente encontrar e use o arquivo s�ntese ou hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Aperte enter quando estiver pronto..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - for�a a gera��o de arquivos hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Favor inserir a m�dia chamada  \"%s\" no dispositivo [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "n�o posso adicionar atualiza��es de uma distribui��o cooker\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "incapaz de obter a pacotes fonte, abortando"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"n�o precisa dar <caminho relativo do hdlist> com --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "incapaz de atualizar m�dia \"%s\"\n"
+"Para satisfazer as depend�ncias, os seguintes pacotes ir�o ser instalados (%"
+"d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Voc� precisa ser root para instalar as seguintes depend�ncias :\n"
 "%s\n"
-"<caminho relativo do hdlist> faltando\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 ""
+"Estes pacotes tem que ser removidos para outros serem atualizados:\n"
 "%s\n"
-"`with' faltando para m�dia ftp\n"
+"Concorda ?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "incapaz de criar m�dia \"%s\"\n"
+msgid "unrequested"
+msgstr "n�o requisitado"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"uso: urpmi.removemedia [-a] <nome> ...\n"
-"onde <nome> � um nome de m�dia para remover.\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "%s conflita com %s"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - seleciona todas as m�dias.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "devido estar faltando %s"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"Op��es desconhecidas '%s'\n"
+msgid "due to unsatisfied %s"
+msgstr "devido a n�o satisfazer %s"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nada para remover (use urpmi.addmedia para adicionar uma m�dia)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "para instalar %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 ""
-"a entrada para remover est� faltando\n"
-"(um de %s)\n"
+"Alguns pacotes n�o puderam ser instalados:\n"
+"%s\n"
+"Concorda ?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"uso: urpmi.update [op��es] <nome> ...\n"
-"onde <nome> � um nome de m�dia para atualizar.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, m� escolha, tente novamente\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - atualize somente a m�dia atualizar.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Qual � a sua escolha? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - seleciona todas as m�dias n�o remov�veis.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Um dos pacotes a seguir � necess�rio:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - for�a o c�lculo completo do arquivo organizado "
-"despslist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Um dos seguintes pacotes s�o necess�rios para instalar %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nada para atualizar (use urpmi.addmedia para adicionar uma m�dia)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Apenas o super-usu�rio tem permiss�o para instalar pacotes"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"a entrada a ser atualizada est� faltando\n"
-"(uma de %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "usando o ambiente espec�fico em %s\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"
-msgstr ""
-"urpmi vers�o %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Este � um software livre, e pode ser redistribu�do sob os termos da GPL, "
-"GNU.\n"
-"\n"
-"uso:\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "N�o foi poss�vel criar o diret�rio [%s] para relat�rio de falhas"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "O que pode ser feito com arquivos rpm bin�rios ao usar --install-src"
+
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: op��o desconhecida \"-%s\", cheque o uso com --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  --synthesis    - usa a s�ntese dada ao inv�s do banco de dados urpmi.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --auto-sele��o - automaticamente seleciona pacotes para atualizar o "
-"sistema.\n"
+"  nomes ou arquivos rpm dados na linha de comando ir�o ser instalados.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - imp�e uma busca aproximada (igual a -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modo verbose.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modo 'quiet'.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --src          - o pr�ximo pacote � um pacote fonte (o mesmo que -s).\n"
+"  -s             - o pr�ximo pacote � um pacote fonte (o mesmo que --src).\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr " --install-src   -instala somente o pacote de fontes (sem bin�rios).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - imp�e uma busca difusa (igual a --fuzzy).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - remove o rpm do cache antes de iniciar.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - n�o procure em 'provides' para econtrar o pacote.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - mant�m o rpm n�o usado no cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - permite a busca em 'provides' para achar o pacote.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - for�a mesmo se alguns pacotes n�o existem.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - seleciona todos os acertos na linha de comando.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - permite ao usu�rio instalar pacotes sem \n"
-"                   checagem de depend�ncias.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath        - exclui o caminho separado por v�rgula.\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  - permite ao usu�rio instalar pacotes sem\n"
-"                   checar depend�ncias e integridade.\n"
+"..--verify-rpm   - verifica a assinatura do rpm antes da instala��o.\n"
+"                   (--no-verify-rpm desabilita; por padr�o � habilitado).\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          - escreve um relat�rio de falhas no diret�rio indicado "
-"pelo\n"
-"                   pr�ximo argumento.\n"
+"  --best-output  - escolhe a melhor interface de acordo com o ambiente:\n"
+"                   X ou modo texto.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - usa  a interface X.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1168,452 +1293,493 @@ msgstr ""
 "de\n"
 "                   falhas).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - usa  a interface X.\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  - escolhe a melhor interface de acordo com o ambiente:\n"
-"                   X ou modo texto.\n"
+"  --bug          - escreve um relat�rio de falhas no diret�rio indicado "
+"pelo\n"
+"                   pr�ximo argumento.\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   - verifica a assinatura do rpm antes da instala��o.\n"
-"                   (--no-verify-rpm desabilita; por padr�o � habilitado).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath        - exclui o caminho separado por v�rgula.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - seleciona todos os acertos na linha de comando.\n"
+"  --proxy-user   - especifica usu�rio e senha para usar na autentica��o\n"
+"                   do proxy (o formato � <usu�rio:senha>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\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 ""
-"  -p             - permite a busca em 'provides' para achar o pacote.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - n�o procure em 'provides' para econtrar o pacote.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - imp�e uma busca difusa (igual a --fuzzy).\n"
+"  --proxy        - usa o proxy HTTP especificado, o n�mero da porta\n"
+"                   � 1080 por default (o formato � <proxyhost[:port]>).\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - o pr�ximo pacote � um pacote fonte (o mesmo que --src).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "   --limit-rate   - limita a velocidade do download.\n"
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modo 'quiet'.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - usa curl para adquirir arquivos distantes.\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modo verbose.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget para adquirir arquivos distantes.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  nomes ou arquivos rpm dados na linha de comando ir�o ser instalados.\n"
+"  --allow-force  - permite ao usu�rio instalar pacotes sem\n"
+"                   checar depend�ncias e integridade.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: op��o desconhecida \"-%s\", cheque o uso com --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "O que pode ser feito com arquivos rpm bin�rios ao usar --install-src"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - permite ao usu�rio instalar pacotes sem \n"
+"                   checagem de depend�ncias.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "N�o foi poss�vel criar o diret�rio [%s] para relat�rio de falhas"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - for�a mesmo se alguns pacotes n�o existem.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "usando o ambiente espec�fico em %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Apenas o super-usu�rio tem permiss�o para instalar pacotes"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - mant�m o rpm n�o usado no cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Um dos seguintes pacotes s�o necess�rios para instalar %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - remove o rpm do cache antes de iniciar.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Um dos pacotes a seguir � necess�rio:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr " --install-src   -instala somente o pacote de fontes (sem bin�rios).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual � a sua escolha? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - o pr�ximo pacote � um pacote fonte (o mesmo que -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, m� escolha, tente novamente\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - imp�e uma busca aproximada (igual a -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Alguns pacotes n�o puderam ser instalados:\n"
-"%s\n"
-"Concorda ?"
+"  --auto-sele��o - automaticamente seleciona pacotes para atualizar o "
+"sistema.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - usa a s�ntese dada ao inv�s do banco de dados urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "devido a n�o satisfazer %s"
+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 vers�o %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Este � um software livre, e pode ser redistribu�do sob os termos da GPL, "
+"GNU.\n"
+"\n"
+"uso:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "devido estar faltando %s"
-
-#: ../urpmi_.c:414
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s conflita com %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "incapaz de atualizar m�dia \"%s\"\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "n�o requisitado"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "incapaz de criar m�dia \"%s\"\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 ""
-"Estes pacotes tem que ser removidos para outros serem atualizados:\n"
 "%s\n"
-"Concorda ?"
+"`with' faltando para m�dia ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Para satisfazer as depend�ncias, os seguintes pacotes ir�o ser instalados (%"
-"d MB)"
+"%s\n"
+"<caminho relativo do hdlist> faltando\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 ""
-"Voc� precisa ser root para instalar as seguintes depend�ncias :\n"
 "%s\n"
+"n�o precisa dar <caminho relativo do hdlist> com --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "incapaz de obter a pacotes fonte, abortando"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "Adquirindo o arquivo rpm [%s]...."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "      %s%% de %s completo, ETA = %s, velocidade = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "n�o posso adicionar atualiza��es de uma distribui��o cooker\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "      %s%% completo, velocidade = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"Op��es desconhecidas '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Favor inserir a m�dia chamada  \"%s\" no dispositivo [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Aperte enter quando estiver pronto..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes pacotes cont�m assinaturas erradas"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Voc� deseja continuar com a instala��o ?"
-
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (s/N) "
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - for�a a gera��o de arquivos hdlist.\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"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
-"Instala��o falhou, alguns arquivos est�o faltando:.\n"
-"%s\n"
-"Voc� deve atualizar a sua base de dados urpmi"
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instala��o falhou"
+"  -h             - tente encontrar e use o arquivo s�ntese ou hdlist.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distribuindo %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tentar instalar sem checar as depend�ncias? (s/N) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tentar instalar com ainda mais for�a (--force)? (s/N) "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "tudo j� instalando"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - limpa o diret�rio dos cabe�alhos de cache.\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"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmq vers�o %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Este � um software livre, e pode ser redistribu�do sob os termos da GPL, "
-"GNU.\n"
-"\n"
-"uso:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list           - lista os pacotes dispon�veis.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - lista as m�dias dispon�veis\n"
-
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --list-nodes   - lista os n�dulos dispon�veis quando  --parallel � usada.\n"
-
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases   - lista os apelidos paralelos dispon�veis\n"
+"  --arch         - usa a arquitetura especificada, o padr�o � a arquitetura "
+"do\n"
+"                   pacote mandrake-release instalado.\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --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 ""
-"  --headers      - extrai cabe�alhos para pacotes listados da base de "
-"dados                    urpmi para stdout (somente root).\n"
+"  --version      - usa a vers�o especificada, o padr�o � a vers�o do\n"
+"                   pacote mandrake-release instalado.\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  --fontes      - fornece todos os pacotes fonte antes de baixar (somente "
-"root).\n"
+"  --from          - usa um endere�o url espec�fico como lista de mirrors, o "
+"padr�o �\n"
+"                   %s\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../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 ""
-"  -d             - estende a consulta para as depend�ncias dos pacotes.\n"
+" --distrib-XXX  -cria automaticamente a m�dia para a parte XXX \n"
+"                        de uma distribui��o, XXX pode ser principal, "
+"atualiza��es ou \n"
+"                         qualquer outro que tenha sido configurado\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"  -u             - remove um pacote se uma vers�o mais atual j� estiver "
-"instalada.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c            - lista completa dos pacotes a remover.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr " -R             - busca reversa para o que requer o pacote.\n"
+"  --distrib      - automaticamente cria todas as m�dias de uma m�dia\n"
+"                   de instala��o.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - imprime grupos, com nome tamb�m.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - cria uma m�dia de atualiza��o.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - imprime vers�o e release com nome tamb�m.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
+msgstr ""
+"uso: urpmi.addmedia [op��es] <nome> <url> [with <caminho_relativo>]\n"
+"onde <url> � uma de\n"
+"       file://<caminho>\n"
+"       ftp://<login>:<senha>@<host>/<caminho> with <nome relativo de "
+"hdlist>\n"
+"       ftp://<host>/<path> with <nome relativo de hdlist>\n"
+"       http://<host>/<path> with <nome relativo de hdlist>\n"
+"       removable://<caminho>\n"
+"\n"
+"e [op��es] s�o de\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "Nomes ou arquivos rpm dados na linha de comando s�o consultados \n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"a entrada para remover est� faltando\n"
+"(um de %s)\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes s� pode ser usado com --parallel"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nada para remover (use urpmi.addmedia para adicionar uma m�dia)\n"
 
-#: placeholder.h:18
+#: ../urpmi.removemedia:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf vers�o %s"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - seleciona todas as m�dias.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"uso: urpmi.removemedia [-a] <nome> ...\n"
+"onde <nome> � um nome de m�dia para remover.\n"
 
-#: placeholder.h:20
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Este software � livre e pode ser redistribuido sob os termos da Licensa "
-"P�blica Geral (GPL), do GNU."
+"a entrada a ser atualizada est� faltando\n"
+"(uma de %s)\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "utiliza��o: urpmf [op��es] <arquivo>"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nada para atualizar (use urpmi.addmedia para adicionar uma m�dia)\n"
 
-#: placeholder.h:22
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  --quiet         - n�o imprime nenhuma tag (defalut, se nenhuma tag dada no "
-"comando"
+"  -d             - for�a o c�lculo completo do arquivo organizado "
+"despslist.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    linha, incompat�vel com modo interativo)."
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - seleciona todas as m�dias n�o remov�veis.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --tudo           - imprime todas as tags."
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - atualize somente a m�dia atualizar.\n"
 
-#: placeholder.h:25
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  --name          - imprime o nome da tag: rpm nome-do-arquivo (suposto, se "
-"nenhuma tag no"
+"uso: urpmi.update [op��es] <nome> ...\n"
+"onde <nome> � um nome de m�dia para atualizar.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes s� pode ser usado com --parallel"
+
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
-"                    linha de comando, por�m sem nenhum nome de pacote)."
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --grupo         - imprime a tag grupo: grupo."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: op��o desconhecida \"-%s\", cheque o uso com --help\n"
 
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - imprime a tag tamanho: tamanho."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "Nomes ou arquivos rpm dados na linha de comando s�o consultados \n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - imprime a tag serial: serial."
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - imprime vers�o e release com nome tamb�m.\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - imprime a tag sum�rio: sum�rio."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - imprime grupos, com nome tamb�m.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - imprime a tag descri��o: descri��o."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr " -R             - busca reversa para o que requer o pacote.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr ""
-"  --provides      - imprime a tag fornece: tudo fornece (m�ltiplas linhas)."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c            - lista completa dos pacotes a remover.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-" --requires      - imprime a tag necessita: tudo necessita "
-"(m�ltiplas                           linhas)."
+"  -u             - remove um pacote se uma vers�o mais atual j� estiver "
+"instalada.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"  --arquivos         - imprime a tag arquivos: tudo arquivos (m�ltiplas "
-"linhas)."
+"  -d             - estende a consulta para as depend�ncias dos pacotes.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflita     - imprime a tag conflita: tudo conflita (m�ltiplas linhas)."
+"  --fontes      - fornece todos os pacotes fonte antes de baixar (somente "
+"root).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --obsoletos     - imprime a tag obsoletos: tudo obsoletos (m�ltiplas "
-"linhas)."
+"  --headers      - extrai cabe�alhos para pacotes listados da base de "
+"dados                    urpmi para stdout (somente root).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases   - lista os apelidos paralelos dispon�veis\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --prereqs       - imprime a tag prereqs: tudo prereqs (m�ltiplas linhas)."
+"  --list-nodes   - lista os n�dulos dispon�veis quando  --parallel � usada.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "Tente urpmf --help para mais op��es"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - lista as m�dias dispon�veis\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "Nenhuma lista completa de m�dia foi encontrada"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list           - lista os pacotes dispon�veis.\n"
+
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq vers�o %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Este � um software livre, e pode ser redistribu�do sob os termos da GPL, "
+"GNU.\n"
+"\n"
+"uso:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl falhou: saiu com %d ou sinal %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Instala��o falhou no n�dulo %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync est� faltando\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp falhou, talvez o destino esteja inalcan��vel"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync falhou: saiu com %d ou sinal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput falhou, talvez o destino esteja inalcan��vel"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh est� faltando\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "Erro de sintaxe no config file na linha %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp falhou no host %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr "M�dia \"%s\" tentou usar uma hdlist j� usada, m�dia ignorada."
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "servidor %s n�o tem uma vers�o compat�vel do urpmi"
 
 #~ msgid "Remove them all?"
 #~ msgstr "Remove todos?"
diff --git a/po/ro.po b/po/ro.po
index 445eb102..e3b314fb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,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-02-24 00:08--200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -15,1155 +15,1274 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instalez %s\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 "DdYy"
 
-#: ../_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 "Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versiunea %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"Instalare automat� a pachetelor...\n"
-"A�i cerut instalarea pachetului %s\n"
+"Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Este OK?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "Folosire: urpmf [OP�IUNI] <fi�ier>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "OK"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - nu afi�eaz� eticheta Nume (implicit dac� nu s-a dat "
+"eticheta �n linia de"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Renun��"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    comand�, incompatibil� cu modul interactiv)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - afi�eaz� toate etichetele"
 
-#: ../_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 "DdYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - afi�are etichet� Nume: rpm numefi�ier (implicit dac� "
+"eticheta nu"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (D/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr ""
+"                    s-a dat �n linia de comand�, dar f�r� nume de pachet)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - afi�are etichet� Grup: grup."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - afi�are etichet� M�rime: m�rime."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        -  afi�are etichet� Serie: serie."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - afi�are etichet� Sumar: sumar."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - afi�are etichet� Descriere: descriere."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - afi�eaz� eticheta Ofer�: tot ce ofer� (linii multiple)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - afi�eaz� eticheta Necesit�: necesit��ile (linii "
+"multiple)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - afi�eaz� eticheta Fi�iere: toate fi�ierele (linii "
+"multiple)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - afi�eaz� eticheta Conflicte: toate conflictele (linii "
+"multiple)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - afi�eaz� eticheta Perimat: toate perimatele (linii "
+"multiple)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - afi�eaz� eticheta Condi�ii obligatorii: toate condi�iile "
+"obligatorii (linii multiple)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "Folosi�i 'urpmf --help' pentru mai multe informa�ii."
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "Nu a fost g�sit� nici o list� media plin�"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: comanda nu a fost g�sit�\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch necunoscut `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (D/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocol necunoscut definit pentru %s"
+msgid "Cancel"
+msgstr "Renun��"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "Nu am g�sit webfetch (acum curl sau wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nu pot folosi protocolul: %s"
+msgid "Is this OK?"
+msgstr "Este OK?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "copierea a e�uat: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Instalare automat� a pachetelor...\n"
+"A�i cerut instalarea pachetului %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget lipse�te\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instalez %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget e�uat: ie�ire cu %d sau semnal %d\n"
+msgid "unable to open rpmdb"
+msgstr "nu pot deschide rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl lipse�te\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "nu pot accesa fi�ierul rpm [%s]"
 
-#: ../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 e �n conflict cu %s"
 
-#: ../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 e cerut de %s"
 
-#: ../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 "nu pot instala pachetul %s"
 
-#: ../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 "nu pot �terge pachetul %s"
 
-#: ../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 "nu pot accesa fi�ierul rpm [%s]"
+msgid "...retrieving failed: %s"
+msgstr "�tergere nereu�it�"
 
-#: ../urpm.pm_.c:600
-#, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nu pot accesa fi�ierul rpm [%s]"
+#: ../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 "Nu pot creea mediul \"%s\"\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 "Nu pot creea mediul \"%s\"\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 "Nu pot creea mediul \"%s\"\n"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Urm�toarele pachete con�in %s: %s"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "no package named %s"
+msgstr "pachete necunoscute "
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
 msgstr "nu pot accesa fi�ierul rpm [%s]"
 
-#: ../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 "nu pot accesa fi�ierul rpm [%s]"
 
-#: ../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 "Nu pot actualiza mediul \"%s\"\n"
-
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--list-nodes poate fi folosit numai cu --parallel"
+msgid "mounting %s"
+msgstr "instalez %s\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 "nu pot deschide rpmdb"
-
-#: ../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 "nu pot accesa fi�ierul rpm [%s]"
-
-#: ../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 "copierea a e�uat: %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 "�tergere nereu�it�"
+msgid "unable to write list file of \"%s\""
+msgstr "Nu pot creea mediul \"%s\"\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 "Nu pot creea mediul \"%s\"\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Nu pot actualiza mediul \"%s\"\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 "Nu pot creea mediul \"%s\"\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 "copierea a e�uat: %s"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nu pot accesa fi�ierul rpm [%s]"
 
-#: ../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 "nu pot accesa fi�ierul rpm [%s]"
+msgid "...copying failed"
+msgstr "copierea a e�uat: %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 "copierea a e�uat: %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
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Nu pot actualiza mediul \"%s\"\n"
-
-#: ../urpm.pm_.c:1519
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr "Nu pot creea mediul \"%s\"\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 "nu pot accesa fi�ierul rpm [%s]"
+
+#: ../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 "instalez %s\n"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--list-nodes poate fi folosit numai cu --parallel"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "Nu pot actualiza mediul \"%s\"\n"
+
+#: ../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 "nu pot accesa fi�ierul rpm [%s]"
 
-#: ../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 "nu pot accesa fi�ierul rpm [%s]"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "nu pot accesa fi�ierul rpm [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "Nu pot creea mediul \"%s\"\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 "pachete necunoscute "
-
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Urm�toarele pachete con�in %s: %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 "Nu pot creea mediul \"%s\"\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 "Nu pot creea mediul \"%s\"\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "nu pot accesa fi�ierul rpm [%s]"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "nu pot accesa fi�ierul rpm [%s]"
+
+#: ../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 "nu pot �terge pachetul %s"
+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 "nu pot instala pachetul %s"
+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 "nu pot accesa fi�ierul rpm [%s]"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s e cerut de %s"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% terminat, viteza = %s"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s e �n conflict cu %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% din %s terminat, ETA = %s, viteza = %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 a e�uat, probabil un nod nu este disponibil"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync e�uat: ie�ire cu %d sau semnal %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 a e�uat, probabil un nod nu este disponibil"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh lipse�te\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "�n nodul %s"
+msgid "rsync is missing\n"
+msgstr "rsync lipse�te\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 "Instalarea a e�uat �n nodul %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl e�uat: ie�ire cu %d sau semnal %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 "Instalarea este posibil�"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl lipse�te\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 a e�uat la gazda %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget e�uat: ie�ire cu %d sau semnal %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 "gazda %s nu are o versiune compatibil� a urpmi "
+msgid "wget is missing\n"
+msgstr "wget lipse�te\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 versiunea %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL.\n"
-"\n"
-"Utilizare:\n"
+msgid "copy failed: %s"
+msgstr "copierea a e�uat: %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             - afi�eaz� acest mesaj.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "nu pot folosi protocolul: %s"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - selectare automat� pachet �n op�iuni.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "Nu am g�sit webfetch (acum curl sau wget)\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "protocol necunoscut definit pentru %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Webfetch necunoscut `%s' !!!\n"
+
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "�tergere nereu�it�"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - verific� dac� instalarea poate fi �ndeplinit� corect.\n"
+"Pentru a satisface dependen�ele, urm�toarele pachete vor fi �terse (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuit �ntre ma�inile cu alias.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Verific pt. �tergerea urm�toarelor pachete"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - selecteaz� toate pachetele ce se potrivesc cu expresia.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nimic de �ters"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: op�iune necunoscut� \"-%s\", verifica�i folosirea cu --help\n"
+msgid "removing package %s will break your system"
+msgstr "�tergerea pachetului %s va strica sistemul dvs"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "pachet necunoscut "
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "pachete necunoscute "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "�tergerea pachetului %s va strica sistemul dvs"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: op�iune necunoscut� \"-%s\", verifica�i folosirea cu --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Nimic de �ters"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selecteaz� toate pachetele ce se potrivesc cu expresia.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Verific pt. �tergerea urm�toarelor pachete"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuit �ntre ma�inile cu alias.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Pentru a satisface dependen�ele, urm�toarele pachete vor fi �terse (%d MB)"
+"  --test         - verific� dac� instalarea poate fi �ndeplinit� corect.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "�tergere nereu�it�"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - selectare automat� pachet �n op�iuni.\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             - afi�eaz� acest mesaj.\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 versiunea %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
+"urpme versiunea %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL.\n"
 "\n"
 "Utilizare:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - folose�te numai mediile de actualizare.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"r�spunsul este:\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"  --media        - folose�te numai mediile date, separate prin virgul�.\n"
+"  )            - parantez� dreapta pentru �nchidere expresii de grup.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"  --synthesis    - folose�te fi�ierul synthesis dat �n loc de urpmi db.\n"
+"  (             - parantez� st�nga pentru deschidere expresii de grup.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "   --verbose             - mod detaliat.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  -!             - Negare unar�, adev�rat� dac� expredia este fals�.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - nu afi�eaz� eticheta Nume (implicit dac� nu s-a dat "
-"eticheta �n linia de comand�,\n"
-"............................ incompatibil cu modul interactiv).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - afi�eaz� toate etichetele\n"
+"  -o             - operator binar SAU, adev�rat dac� una dintre expresii "
+"este adev�rat�.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - afi�are etichet� Nume: rpm numefi�ier (implicit dac� "
-"eticheta nu a fost dat� �n linia de\n"
-"comand�, dar f�r� nume pachet).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - afi�are etichet� Grup: grup.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - afi�are etichet� M�rime: m�rime.\n"
+"  -a             - operator binar �I, adev�rat dac� ambele expresii sunt "
+"adev�rate.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch          - afi�are etichet� Epoc�: epoc�.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include codul perl direct ca perl -e.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - afi�are etichet� Sumar: sumar.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - afi�eaz� versiune, edi�ie �i arhitectur� cu nume.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - afi�are etichet� Descriere: descriere.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - ignor� diferen�ierea majusculelor �n toate modelele.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - afi�eaz� eticheta Ofer�: tot ce ofer� (linii multiple).\n"
+"  --obsoletes     - afi�eaz� eticheta Perimat: toate perimatele (linii "
+"multiple).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - afi�eaz� eticheta Necesit�: toate necesit��ile (linii "
+"  --conflicts     - afi�eaz� eticheta Conflicte: toate conflictele (linii "
 "multiple).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 "  --files         - afi�eaz� eticheta Fi�iere: toate fi�ierele (linii "
 "multiple).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - afi�eaz� eticheta Conflicte: toate conflictele (linii "
+"  --requires      - afi�eaz� eticheta Necesit�: toate necesit��ile (linii "
 "multiple).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - afi�eaz� eticheta Perimat: toate perimatele (linii "
-"multiple).\n"
+"  --provides      - afi�eaz� eticheta Ofer�: tot ce ofer� (linii multiple).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignor� diferen�ierea majusculelor �n toate modelele.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - afi�are etichet� Descriere: descriere.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - afi�eaz� versiune, edi�ie �i arhitectur� cu nume.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - afi�are etichet� Sumar: sumar.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include codul perl direct ca perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch          - afi�are etichet� Epoc�: epoc�.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - afi�are etichet� M�rime: m�rime.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - afi�are etichet� Grup: grup.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - operator binar �I, adev�rat dac� ambele expresii sunt "
-"adev�rate.\n"
+"  --name          - afi�are etichet� Nume: rpm numefi�ier (implicit dac� "
+"eticheta nu a fost dat� �n linia de\n"
+"comand�, dar f�r� nume pachet).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - afi�eaz� toate etichetele\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - operator binar SAU, adev�rat dac� una dintre expresii "
-"este adev�rat�.\n"
+"  --quiet         - nu afi�eaz� eticheta Nume (implicit dac� nu s-a dat "
+"eticheta �n linia de comand�,\n"
+"............................ incompatibil cu modul interactiv).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  -!             - Negare unar�, adev�rat� dac� expredia este fals�.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "   --verbose             - mod detaliat.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  (             - parantez� st�nga pentru deschidere expresii de grup.\n"
+"  --synthesis    - folose�te fi�ierul synthesis dat �n loc de urpmi db.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  )            - parantez� dreapta pentru �nchidere expresii de grup.\n"
+"  --media        - folose�te numai mediile date, separate prin virgul�.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"r�spunsul este:\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - folose�te numai mediile de actualizare.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"Utilizare: urpmi.addmedia [op�iuni] <nume> <url> [with <cale_relativ�>]\n"
-"unde <url> este una din\n"
-"      file://<path>\n"
-"       ftp://<login>:<parola>@<gazd�>/<cale> with <nume relativ pt. hdlist>\n"
-"       ftp://<gazd�>/<cale> with <nume relativ pt. hdlist>\n"
-"       http://<gazd�>/<cale> with <nume relativ pt. hdlist>\n"
-"       removable://<cale>\n"
+"urpmf versiunea %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL.\n"
 "\n"
-"�i [op�iuni] sunt dintre\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         - folose�te wget pentru ob�inerea fi�ierelor de la "
-"distan��.\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         - folose�te curl pentru ob�inerea fi�ierelor de la "
-"distan��.\n"
+"Utilizare:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limiteaz� viteza de desc�rcare.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "totul este deja instalat"
 
-#: ../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        - folose�te HTTP proxy specificat, num�rul portului este "
-"considerat a fi\n"
-"                   implicit 1080 (formatul este <gazd�proxy[:port]>).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalarea este posibil�"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - specificare utilizator �i parol� pt. autentificarea "
-"proxy\n"
-"                   (formatul este <utilizator:parol�>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalarea a e�uat"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - creeaz� un mediu de actualizare.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "�ncearc� instalarea �nc� �i mai dur (--force)? (d/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - crearea automat� a tuturor mediilor de pe un mediu de "
-"instalare.\n"
-"\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "S� �ncerc instalarea f�r� verificarea dependen�elor? (d/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  - creeaz� automat un mediu pentru partea  XXX  a unei\n"
-"                   distribu�ii, XXX poate fi main, contrib, updates sau\n"
-"                   orice altceva a fost configurat ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distribui %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --from         - folose�te URL-ul specificat pentru lista oglinzilor, "
-"implicit este \n"
-"                       %s\n"
+"Instalare nereu�it�, unele fi�iere lipsesc.\n"
+"%s\n"
+"Probabil ar trebui s� actualiza�i baza de date urpmi."
 
-#: ../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"
-msgstr ""
-"  --version      - folose�te versiunea de distribu�ie specificat�, versiunea "
-"implicit�                   este preluat� de la versiunea distribu�iei "
-"raportat� de pachetul                   mandrake-release instalat.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (D/n) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - folose�te arhitectura specificat�, implicit� este "
-"arhitectura\n"
-"                   edi�iei Mandrake instalat�\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Dori�i s� continua�i instalarea?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - cur��� directorul cache antete.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Urm�toarele pachete au semn�turi gre�ite"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - �ncearc� g�sirea �i folosirea fi�ierelor synthesis "
-"sau                      hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Ap�sa�i Enter c�nd e gata..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - for�eaz� generarea fi�ierelor hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "V� rog s� introduce�i mediul numit \"%s\" �n dispozitivul [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nu pot ad�uga actualiz�ri de la o distribu�ie Cooker\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "Nu pot prelua pachetele surs�, �ntrerup"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"nu e nevoie s� da�i <calea relativ� pt. hdlist> cu --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "Nu pot actualiza mediul \"%s\"\n"
+"Pentru a satisface dependen�ele, urm�toarele pachete vor fi instalate (% d "
+"MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Regret, trebuie s� fi�i root pentru a instala urm�toarele pachete "
+"dependente:\n"
 "%s\n"
-"lipse�te <calea relativ� a hdlist>\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 ""
+"Unrm�toarele pachete trebuie �terse pentru ca altele s� fie actualizate:\n"
 "%s\n"
-"`with' lipse�te pentru mediul ftp\n"
+"Sunte�i de acord?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "Nu pot creea mediul \"%s\"\n"
+msgid "unrequested"
+msgstr "necerute"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"Utilizare: urpmi.removemedia [-a] <nume>...\n"
-"unde <nume> este numele mediului de �ters.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "datorita %s �n conflict"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selecteaz� toate mediile.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "datorit� %s lips�"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"op�iuni necunoscute '%s'\n"
+msgid "due to unsatisfied %s"
+msgstr "datorit� %s nesatisf�cute"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nimic de �ters (folosi�i urpmi.addmedia pentru a ad�uga un mediu)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "pentru a instala %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 ""
-"intrarea de �ters lipse�te\n"
-"(una din %s)\n"
+"Unele pachete cerute nu pot fi instalate:\n"
+"%s\n"
+"Sunte�i de acord?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"Utilizare: urpmi.update [op�iuni] <nume>...\n"
-"unde <nume> este numele mediului de actualizat.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "A�i ales gre�it, �ncerca�i din nou\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - folose�te numai mediile de actualizare.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Ce alege�i? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - selecteaz� toate mediile nedemontabile.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Unul din urm�toarele pachete e necesar:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - for�eaz� calcularea complet� a fi�ierului depslist."
-"ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Unul din urm�toarele pachete e necesar pt. instalarea %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"nimic de actualizat (folosi�i urpmi.addmedia pentru a ad�uga un mediu)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Doar superutilizatorul poate instala pachete"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"intrarea de actualizat lipse�te\n"
-"(una din %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "folosind mediul specific pe %s\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 "Nu pot creea directorul [%s] pentru raportul de erori"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"urpmi versiunea %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL.\n"
-"\n"
-"Utilizare:\n"
+"Ce se poate face cu fi�ierele rpm binare c�nd se folose�te --install-src"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: op�iune necunoscut� \"-%s\", verifica�i folosirea cu --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  --synthesis    - folose�te fi�ierul synthesis dat �n loc de urpmi db.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --auto-select  - selectare automat� pachete pentru actualizare sistem.\n"
+"  numele sau fi�ierele rpm date �n linia de comand� vor fi instalate.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy             - impune c�utarea fuzzy (identic cu -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mod detaliat.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mod silen�ios.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --src          - pachetul urm�tor este un pachet surs� ( identic cu -s).\n"
+"  -s          - pachetul urm�tor este un pachet surs� ( identic cu -src).\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instaleaz� numai pachetele surs� (f�r� binare).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impune c�utarea fuzzy (identic cu --fuzzy).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -p             - nu c�uta �n Provides pentru g�sirea pachetelor.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --clean        - �terge rpm-urile din cache �nainte de orice altceva.\n"
+"  -p             - permite c�utarea �n Provides pentru g�sirea pachetelor.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - p�strez� rpm-urile nefolosite �n cache.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - selecteaz� toate potrivirile �n linia de comand�.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - for�eaz� invocarea chiar dac� unele pachete nu exist�.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - exclude calea separat� prin virgul�.\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --allow-nodeps - permite interogarea utilizatorului pt. instalarea "
-"pachetelor f�r�\n"
-"                   verificarea dependen�elor\n"
+"  --verify-rpm   - verific� semn�tura rpm �nainte de instalare.\n"
+"                  (--no-verify-rpm o dezactiveaz�, implicit este activat�).\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-force - permite interogarea utilizatorului pt. instalarea "
-"pachetelor f�r�\n"
-"                   verificarea dependen�elor �i a integrit��ii\n"
+"  --best-output  - alege cea mai bun� interfa�� �n func�ie de mediul de "
+"lucru:\n"
+"                   X sau mod text.\n"
 
-#: ../urpmi_.c:96
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - produce un raport de erori �n directorul indicat de \n"
-"argumentul urm�tor.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - folose�te interfa�a X.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1171,447 +1290,499 @@ msgstr ""
 "  --env          - folose�te un mediu specificat (tipic un raport de \n"
 "erori).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - folose�te interfa�a X.\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  - alege cea mai bun� interfa�� �n func�ie de mediul de "
-"lucru:\n"
-"                   X sau mod text.\n"
+"  --bug          - produce un raport de erori �n directorul indicat de \n"
+"argumentul urm�tor.\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   - verific� semn�tura rpm �nainte de instalare.\n"
-"                  (--no-verify-rpm o dezactiveaz�, implicit este activat�).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - exclude calea separat� prin virgul�.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - selecteaz� toate potrivirile �n linia de comand�.\n"
+"  --proxy-user   - specificare utilizator �i parol� pt. autentificarea "
+"proxy\n"
+"                   (formatul este <utilizator:parol�>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\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 ""
-"  -p             - permite c�utarea �n Provides pentru g�sirea pachetelor.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -p             - nu c�uta �n Provides pentru g�sirea pachetelor.\n"
+"  --proxy        - folose�te HTTP proxy specificat, num�rul portului este "
+"considerat a fi\n"
+"                   implicit 1080 (formatul este <gazd�proxy[:port]>).\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impune c�utarea fuzzy (identic cu --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limiteaz� viteza de desc�rcare.\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 "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"  -s          - pachetul urm�tor este un pachet surs� ( identic cu -src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mod silen�ios.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mod detaliat.\n"
+"  --curl         - folose�te curl pentru ob�inerea fi�ierelor de la "
+"distan��.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"  numele sau fi�ierele rpm date �n linia de comand� vor fi instalate.\n"
+"  --wget         - folose�te wget pentru ob�inerea fi�ierelor de la "
+"distan��.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: op�iune necunoscut� \"-%s\", verifica�i folosirea cu --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"Ce se poate face cu fi�ierele rpm binare c�nd se folose�te --install-src"
+"  --allow-force - permite interogarea utilizatorului pt. instalarea "
+"pachetelor f�r�\n"
+"                   verificarea dependen�elor �i a integrit��ii\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nu pot creea directorul [%s] pentru raportul de erori"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - permite interogarea utilizatorului pt. instalarea "
+"pachetelor f�r�\n"
+"                   verificarea dependen�elor\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "folosind mediul specific pe %s\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - for�eaz� invocarea chiar dac� unele pachete nu exist�.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Doar superutilizatorul poate instala pachete"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - p�strez� rpm-urile nefolosite �n cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Unul din urm�toarele pachete e necesar pt. instalarea %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - �terge rpm-urile din cache �nainte de orice altceva.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Unul din urm�toarele pachete e necesar:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instaleaz� numai pachetele surs� (f�r� binare).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ce alege�i? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - pachetul urm�tor este un pachet surs� ( identic cu -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "A�i ales gre�it, �ncerca�i din nou\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy             - impune c�utarea fuzzy (identic cu -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Unele pachete cerute nu pot fi instalate:\n"
-"%s\n"
-"Sunte�i de acord?"
+"  --auto-select  - selectare automat� pachete pentru actualizare sistem.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "pentru a instala %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - folose�te fi�ierul synthesis dat �n loc de urpmi db.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "datorit� %s nesatisf�cute"
+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 versiunea %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL.\n"
+"\n"
+"Utilizare:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "datorit� %s lips�"
+msgid "unable to update medium \"%s\"\n"
+msgstr "Nu pot actualiza mediul \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "datorita %s �n conflict"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "necerute"
+msgid "unable to create medium \"%s\"\n"
+msgstr "Nu pot creea mediul \"%s\"\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 ""
-"Unrm�toarele pachete trebuie �terse pentru ca altele s� fie actualizate:\n"
 "%s\n"
-"Sunte�i de acord?"
+"`with' lipse�te pentru mediul ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Pentru a satisface dependen�ele, urm�toarele pachete vor fi instalate (% d "
-"MB)"
+"%s\n"
+"lipse�te <calea relativ� a hdlist>\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 ""
-"Regret, trebuie s� fi�i root pentru a instala urm�toarele pachete "
-"dependente:\n"
 "%s\n"
+"nu e nevoie s� da�i <calea relativ� pt. hdlist> cu --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "Nu pot prelua pachetele surs�, �ntrerup"
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% din %s terminat, ETA = %s, viteza = %s"
+msgid "retrieving mirrors at %s ..."
+msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% terminat, viteza = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nu pot ad�uga actualiz�ri de la o distribu�ie Cooker\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 "V� rog s� introduce�i mediul numit \"%s\" �n dispozitivul [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Ap�sa�i Enter c�nd e gata..."
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"op�iuni necunoscute '%s'\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Urm�toarele pachete au semn�turi gre�ite"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - for�eaz� generarea fi�ierelor hdlist.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Dori�i s� continua�i instalarea?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - �ncearc� g�sirea �i folosirea fi�ierelor synthesis "
+"sau                      hdlist.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (D/n) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - cur��� directorul cache antete.\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 ""
-"Instalare nereu�it�, unele fi�iere lipsesc.\n"
-"%s\n"
-"Probabil ar trebui s� actualiza�i baza de date urpmi."
+"  --arch         - folose�te arhitectura specificat�, implicit� este "
+"arhitectura\n"
+"                   edi�iei Mandrake instalat�\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instalarea a e�uat"
+#: ../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      - folose�te versiunea de distribu�ie specificat�, versiunea "
+"implicit�                   este preluat� de la versiunea distribu�iei "
+"raportat� de pachetul                   mandrake-release instalat.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distribui %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - folose�te URL-ul specificat pentru lista oglinzilor, "
+"implicit este \n"
+"                       %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "S� �ncerc instalarea f�r� verificarea dependen�elor? (d/N) "
+#: ../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  - creeaz� automat un mediu pentru partea  XXX  a unei\n"
+"                   distribu�ii, XXX poate fi main, contrib, updates sau\n"
+"                   orice altceva a fost configurat ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "�ncearc� instalarea �nc� �i mai dur (--force)? (d/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - crearea automat� a tuturor mediilor de pe un mediu de "
+"instalare.\n"
+"\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "totul este deja instalat"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - creeaz� un mediu de actualizare.\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 versiunea %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL.\n"
+"Utilizare: urpmi.addmedia [op�iuni] <nume> <url> [with <cale_relativ�>]\n"
+"unde <url> este una din\n"
+"      file://<path>\n"
+"       ftp://<login>:<parola>@<gazd�>/<cale> with <nume relativ pt. hdlist>\n"
+"       ftp://<gazd�>/<cale> with <nume relativ pt. hdlist>\n"
+"       http://<gazd�>/<cale> with <nume relativ pt. hdlist>\n"
+"       removable://<cale>\n"
 "\n"
-"Utilizare:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - listeaz� pachetele disponibile.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - listeaz� mediile disponibile.\n"
+"�i [op�iuni] sunt dintre\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   - listeaz� nodurile disponibile c�nd se folose�te --"
-"parallel.\n"
+"intrarea de �ters lipse�te\n"
+"(una din %s)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases   - listeaz� alias-urile paralele disponibile.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nimic de �ters (folosi�i urpmi.addmedia pentru a ad�uga un mediu)\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selecteaz� toate mediile.\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      - extrage antete pentru pachetul listat din urpmi db la\n"
-"                   stdout (numai root).\n"
+"Utilizare: urpmi.removemedia [-a] <nume>...\n"
+"unde <nume> este numele mediului de �ters.\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      - d� toate pachetele surs� �nainte de desc�rcare (numai "
-"root).\n"
+"intrarea de actualizat lipse�te\n"
+"(una din %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - extinde interogarea la dependen�ele pachetelor.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nimic de actualizat (folosi�i urpmi.addmedia pentru a ad�uga un mediu)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - �terge pachetul dac� o versiune mai recent� este deja "
-"instalat�.\n"
+"  -d             - for�eaz� calcularea complet� a fi�ierului depslist."
+"ordered.\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - ie�ire complet� cu pachetul ce va fi �ters.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - selecteaz� toate mediile nedemontabile.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - folose�te numai mediile de actualizare.\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  -R             - c�utare invers� �n lista de dependen�e a pachetului.\n"
+"Utilizare: urpmi.update [op�iuni] <nume>...\n"
+"unde <nume> este numele mediului de actualizat.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - arat� grupurile �i cu nume.\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes poate fi folosit numai cu --parallel"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - afi�eaz� versiunea �i edi�ia cu nume.\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: op�iune necunoscut� \"-%s\", verifica�i folosirea cu --help\n"
+
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  numele sau fi�ierele rpm date �n linia de comand� sunt interogate.\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes poate fi folosit numai cu --parallel"
-
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versiunea %s"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - afi�eaz� versiunea �i edi�ia cu nume.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - arat� grupurile �i cu nume.\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL."
+"  -R             - c�utare invers� �n lista de dependen�e a pachetului.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "Folosire: urpmf [OP�IUNI] <fi�ier>"
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - ie�ire complet� cu pachetul ce va fi �ters.\n"
 
-#: placeholder.h:22
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --quiet         - nu afi�eaz� eticheta Nume (implicit dac� nu s-a dat "
-"eticheta �n linia de"
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    comand�, incompatibil� cu modul interactiv)."
+"  -u             - �terge pachetul dac� o versiune mai recent� este deja "
+"instalat�.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - afi�eaz� toate etichetele"
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - extinde interogarea la dependen�ele pachetelor.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --name          - afi�are etichet� Nume: rpm numefi�ier (implicit dac� "
-"eticheta nu"
+"  --sources      - d� toate pachetele surs� �nainte de desc�rcare (numai "
+"root).\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"                    s-a dat �n linia de comand�, dar f�r� nume de pachet)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - afi�are etichet� Grup: grup."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - afi�are etichet� M�rime: m�rime."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        -  afi�are etichet� Serie: serie."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - afi�are etichet� Sumar: sumar."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - afi�are etichet� Descriere: descriere."
+"  --headers      - extrage antete pentru pachetul listat din urpmi db la\n"
+"                   stdout (numai root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr ""
-"  --provides      - afi�eaz� eticheta Ofer�: tot ce ofer� (linii multiple)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases   - listeaz� alias-urile paralele disponibile.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --requires      - afi�eaz� eticheta Necesit�: necesit��ile (linii "
-"multiple)."
+"  --list-nodes   - listeaz� nodurile disponibile c�nd se folose�te --"
+"parallel.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --files         - afi�eaz� eticheta Fi�iere: toate fi�ierele (linii "
-"multiple)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - listeaz� mediile disponibile.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr ""
-"  --conflicts     - afi�eaz� eticheta Conflicte: toate conflictele (linii "
-"multiple)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - listeaz� pachetele disponibile.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr ""
-"  --obsoletes     - afi�eaz� eticheta Perimat: toate perimatele (linii "
-"multiple)."
-
-#: 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       - afi�eaz� eticheta Condi�ii obligatorii: toate condi�iile "
-"obligatorii (linii multiple)."
+"urpmq versiunea %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL.\n"
+"\n"
+"Utilizare:\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "Folosi�i 'urpmf --help' pentru mai multe informa�ii."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalarea a e�uat �n nodul %s"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "Nu a fost g�sit� nici o list� media plin�"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp a e�uat, probabil un nod nu este disponibil"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl e�uat: ie�ire cu %d sau semnal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput a e�uat, probabil un nod nu este disponibil"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync lipse�te\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "�n nodul %s"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync e�uat: ie�ire cu %d sau semnal %d\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp a e�uat la gazda %s"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh lipse�te\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "gazda %s nu are o versiune compatibil� a urpmi "
diff --git a/po/ru.po b/po/ru.po
index 331ffba6..4e9f453d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,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-02-22 13:44+0200\n"
 "Last-Translator: Pavel <acid_jack@ukr.net>\n"
 "Language-Team: Russian <acid_jack@ukr.net>\n"
@@ -16,1146 +16,1281 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "��������������� %s\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 "��Yy"
+
+#. 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 "��Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf ������ %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 ""
-"�������������� ��������� �������...\n"
-"�� ��������� ��������� ������ %s\n"
+"��� �������� ����������� ����������� � ����� ���������������� �������� "
+"�������� GNU GPL"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "��� ���������?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "�������������: urpmf [�����] <����>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - �� �������� ��� name (�� ���������, ���� ��� �� ����� � "
+"���������"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "������"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    ������, �� ��������� � ������������� �������)."
 
-#: ../_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 "��Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - �������� ��� ����."
 
-#: ../_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 "��Yy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - �������� ��� name: ��� ����� rpm (��������, ���� ��� �� "
+"�����"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (�/�) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    � ��������� ������, �� ��� ����� ������."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - �������� ��� group: ������."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - �������� ��� size: ������."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - �������� ��� serial: �������� �����."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary        - �������� ��� summary: ����� ��������."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - �������� ��� description: ��������."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides       - �������� ��� provides: ��� ������������ ����� "
+"(������������� �����)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires       - �������� ��� requires: ��� ����������� �����"
+"(������������� �����)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - �������� ��� files: ��� ����� (������������� �����)"
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - �������� ��� conflicts: ��� ������������� �����"
+"(������������� �����)"
 
-#: ../_irpm_.c:63
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - �������� ��� obsoletes: ��� ���������� �����"
+"(������������� �����)"
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --preregs       - �������� ��� preregs: ��� �������������� "
+"������������������ (������������� �����)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "���������� urpmf -help ��� �������������� �����"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "��� ������ �������� ������ �����������"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: ������� �� �������\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "����������� webfetch `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (�/�) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "��� %s ��������� ����������� �������"
+msgid "Cancel"
+msgstr "������"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "�� ������ webfetch (� ������ ������ curl ��� wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "���������� ���������� ��������: %s"
+msgid "Is this OK?"
+msgstr "��� ���������?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "����������� ����������� ��������: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"�������������� ��������� �������...\n"
+"�� ��������� ��������� ������ %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget �����������\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "��������������� %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ��� ����: �������� � %d ��� �������� %d\n"
+msgid "unable to open rpmdb"
+msgstr "���������� ������� rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl �����������\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "���������� �������� ������ � ����� rpm [%s]"
 
-#: ../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 ����������� � %s"
 
-#: ../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 ����� ��� %s"
 
-#: ../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 "���������� ���������� ����� %s"
 
-#: ../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 "���������� ������� ����� %s"
 
-#: ../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 "���������� �������� ������ � ����� rpm [%s]"
+msgid "...retrieving failed: %s"
+msgstr "�������� ����������� ��������"
 
-#: ../urpm.pm_.c:600
-#, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "���������� �������� ������ � ����� rpm [%s]"
+#: ../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 "���������� ������� ���������� \"%s\"\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 "���������� ������� ���������� \"%s\"\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:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../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 "���������� ������� ���������� \"%s\"\n"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "��������� ������ �������� %s: %s"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "no package named %s"
+msgstr "����������� �����"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
 msgstr "���������� �������� ������ � ����� rpm [%s]"
 
-#: ../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 "���������� �������� ������ � ����� rpm [%s]"
 
-#: ../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 "���������� �������� ���������� \"%s\"\n"
-
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--list-nodes ����� ���� ����������� ������ � --parallel"
+msgid "mounting %s"
+msgstr "��������������� %s\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"
-
-#: ../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 "���������� �������� ������ � ����� rpm [%s]"
-
-#: ../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 "����������� ����������� ��������: %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 "�������� ����������� ��������"
+msgid "unable to write list file of \"%s\""
+msgstr "���������� ������� ���������� \"%s\"\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 "���������� ������� ���������� \"%s\"\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "���������� �������� ���������� \"%s\"\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 "���������� ������� ���������� \"%s\"\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 "����������� ����������� ��������: %s"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "���������� �������� ������ � ����� rpm [%s]"
 
-#: ../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 "���������� �������� ������ � ����� rpm [%s]"
+msgid "...copying failed"
+msgstr "����������� ����������� ��������: %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 "����������� ����������� ��������: %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
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "���������� �������� ���������� \"%s\"\n"
-
-#: ../urpm.pm_.c:1519
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr "���������� ������� ���������� \"%s\"\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 "���������� �������� ������ � ����� rpm [%s]"
+
+#: ../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\n"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--list-nodes ����� ���� ����������� ������ � --parallel"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "���������� �������� ���������� \"%s\"\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 "���������� �������� ������ � ����� rpm [%s]"
 
-#: ../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 "���������� �������� ������ � ����� rpm [%s]"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "���������� �������� ������ � ����� rpm [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "���������� ������� ���������� \"%s\"\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 "����������� �����"
-
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "��������� ������ �������� %s: %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 "���������� ������� ���������� \"%s\"\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 "���������� ������� ���������� \"%s\"\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "���������� �������� ������ � ����� rpm [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "���������� �������� ������ � ����� rpm [%s]"
 
-#: ../urpm.pm_.c:2260
+#: ../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 "���������� ������� ����� %s"
+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 "���������� ���������� ����� %s"
+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 "���������� �������� ������ � ����� rpm [%s]"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s ����� ��� %s"
+msgid "        %s%% completed, speed = %s"
+msgstr "        ��������� %s%%, �������� = %s"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s ����������� � %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        ��������� %s%% �� %s, ETA = %s, �������� = %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 ���������� ��������, �������� ���� ����������"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync ��� ����: �������� � %d ��� �������� %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 ���������� ��������, �������� ���� ����������"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh �����������\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"
+msgid "rsync is missing\n"
+msgstr "rsync �����������\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 "��������� �� ���� %s �� �����������."
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl ��� ����: �������� � %d ��� �������� %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 "��������� ��������."
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl �����������\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 ���������� �������� �� ����� %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget ��� ����: �������� � %d ��� �������� %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 "�� ����� %s ����������� ������� ������ urpi"
+msgid "wget is missing\n"
+msgstr "wget �����������\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 ""
-"urpmi ������ %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"��� �������� ����������� ����������� � ��� ����� ���������������� ��� "
-"���������� ������� GNU GPL.\n"
-"\n"
-"�������������:\n"
+msgid "copy failed: %s"
+msgstr "����������� ����������� ��������: %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         - ������� ��� ���������.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "���������� ���������� ��������: %s"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - ������������� ������� ����� �� ������������.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "�� ������ webfetch (� ������ ������ curl ��� wget)\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "��� %s ��������� ����������� �������"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "����������� webfetch `%s' !!!\n"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "�������� ����������� ��������"
+
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - ���������, ���� ��������� ����� ���� ��������� "
-"���������.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "��� �������������� ������������ ��������� ������ ����� ������� (%d ��)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - urpmi, ������������ �� ������� ������.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "����������� ����������� �������� ��������� �������"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - ������� ��� ������, ��������������� ����������.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "������ �������"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: ����������� ����� \"-%s\", ��������� ������������� � --help\n"
+msgid "removing package %s will break your system"
+msgstr "�������� ������ %s ������� ������ ����� �������"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "����������� �����"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "����������� �����"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "�������� ������ %s ������� ������ ����� �������"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: ����������� ����� \"-%s\", ��������� ������������� � --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "������ �������"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - ������� ��� ������, ��������������� ����������.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "����������� ����������� �������� ��������� �������"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - urpmi, ������������ �� ������� ������.\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 "��� �������������� ������������ ��������� ������ ����� ������� (%d ��)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - ���������, ���� ��������� ����� ���� ��������� "
+"���������.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "�������� ����������� ��������"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - ������������� ������� ����� �� ������������.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - ������� ��� ���������.\n"
+
+#: ../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 ������ %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
+"urpmi ������ %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "��� �������� ����������� ����������� � ��� ����� ���������������� ��� "
 "���������� ������� GNU GPL.\n"
 "\n"
 "�������������:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - ������������ ������ ���������� ��� ����������.\n"
-
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
-"  --media        - ������������ ������ ��������� ����������, ����������� "
-"��������.\n"
+"�������� ����� :\n"
+"%s\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - ������������ ������-���� ������ �� urpmi.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - ������ ������, ����������� ������ ���������.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - ��������� �����.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - ����� ������, ����������� ������ ���������.\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"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
-"  --quiet        - �� �������� ��� name (�� ���������, ���� ��� �� ����� � "
-"���������                   ������, ������������ � ������������� �������).\n"
+"  !              - ������� NOT, ��������� ������, ���� ���������\n"
+"                          �����.\n"
 
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - �������� ��� ����.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
+"  -o             - �������� �������� OR, ���������� ������, ���� ����\n"
+"                   �� ��������� �������.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name         - �������� ��� name: ��� ����� rpm (��������, ���� ��� ��\n"
-"                   ����� � ��������� ������, �� ��� ����� ������).\n"
+"  -a             - �������� �������� AND, ���������� ������, ���� ���\n"
+"                   ��������� �������.\n"
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - �������� ��� group: ������.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - �������� ��� perl ��������������� ��� perl -e.\n"
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - �������� ��� size: ������.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - ������� ������, ����� � ����� � ���������.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size         - �������� ��� size: ������.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ������������ ������ ������� � ����� �����.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - �������� ��� summary: ����� ��������.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+"  --obsoletes     - �������� ��� obsoletes: ��� ���������� �����\n"
+"                    (������������� �����).\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - �������� ��� description: ��������.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+"  --conflicts     - �������� ��� conflicts: ��� ������������� �����\n"
+"                    (������������� �����).\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
-"  --provides     - �������� ��� provides: ��� ������������ �����\n"
+"  --files        - �������� ��� files: ��� �����\n"
 "                          (������������� �����).\n"
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 "  --requires     - �������� ��� requires: ��� ����������� �����\n"
 "                          (������������� �����).\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --files        - �������� ��� files: ��� �����\n"
+"  --provides     - �������� ��� provides: ��� ������������ �����\n"
 "                          (������������� �����).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr ""
-"  --conflicts     - �������� ��� conflicts: ��� ������������� �����\n"
-"                    (������������� �����).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - �������� ��� description: ��������.\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr ""
-"  --obsoletes     - �������� ��� obsoletes: ��� ���������� �����\n"
-"                    (������������� �����).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - �������� ��� summary: ����� ��������.\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ������������ ������ ������� � ����� �����.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size         - �������� ��� size: ������.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - ������� ������, ����� � ����� � ���������.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - �������� ��� size: ������.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - �������� ��� perl ��������������� ��� perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - �������� ��� group: ������.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - �������� �������� AND, ���������� ������, ���� ���\n"
-"                   ��������� �������.\n"
+"  --name         - �������� ��� name: ��� ����� rpm (��������, ���� ��� ��\n"
+"                   ����� � ��������� ������, �� ��� ����� ������).\n"
 
-#: ../urpmf_.c:55
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - �������� �������� OR, ���������� ������, ���� ����\n"
-"                   �� ��������� �������.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - �������� ��� ����.\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  !              - ������� NOT, ��������� ������, ���� ���������\n"
-"                          �����.\n"
+"  --quiet        - �� �������� ��� name (�� ���������, ���� ��� �� ����� � "
+"���������                   ������, ������������ � ������������� �������).\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - ����� ������, ����������� ������ ���������.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - ��������� �����.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - ������ ������, ����������� ������ ���������.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - ������������ ������-���� ������ �� urpmi.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"�������� ����� :\n"
-"%s\n"
+"  --media        - ������������ ������ ��������� ����������, ����������� "
+"��������.\n"
+
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - ������������ ������ ���������� ��� ����������.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"�������������: urpmi.addmedia [�����] <���> <url> [with "
-"<�������������_����>]\n"
-"��� <url> �������� ����� ��\n"
-"       file://<����>\n"
-"       ftp://<�����>:<������>@<����>/<����> with <������������� ��� �����  "
-"hdlist>\n"
-"       ftp://<����>/<����> with <������������� ��� ����� hdlist>\n"
-"       http://<����>/<����> with <������������� ��� ����� hdlist>\n"
-"       removable://<����>\n"
+"urpmf ������ %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"��� �������� ����������� ����������� � ��� ����� ���������������� ��� "
+"���������� ������� GNU GPL.\n"
 "\n"
-"� [�����] �������� ������ ��\n"
+"�������������:\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 ��� ��������� ��������� ������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "��� ��� �����������"
 
-#: ../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 ��� ��������� ��������� ������.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "��������� ��������."
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - ���������� �������� ����������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "��������� �� ���������."
 
-#: ../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        - ������������ ������������ HTTP-������, �� ���������\n"
-"                   ������������ ���� 1080 (������ <������-������[:����]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "����������� ���������� ��� ����� ���������� (--force)? (�/�) "
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - ������� ������������ � ������, ������������ ��� ������\n"
-"                   �������������� (������ <������������:������>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "����������� ��������� ��� �������� ������������? (�/�) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - ������� ���������� ��� ����������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "�������������� %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --disrtib      - ������������� ������� ��� ����������  � "
-"�������������                    ����������.\n"
+"��������� ��������, ��������� ����� �����������:\n"
+"%s\n"
+"��� ����� ������������� �������� ���� ���� ������ urpmi"
 
-#: ../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  - ������������� ������� ���������� ��� ����� ���\n"
-"                   ������������, XXX ����� ���� main, contrib, updates ���\n"
-"                   ��� ������, ��� ��� ���� ��������� ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (�/�) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - ������������ ��������� url ��� ������ ������, ��\n"
-"                   ��������� ������������ %s\n"
+msgid "Do you want to continue installation ?"
+msgstr "������� ���������� ���������?"
 
-#: ../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"
-msgstr ""
-"  --version      - ������������ ��������� ������ ������������, �� ���������\n"
-"                   ������������ ������ ������������, ����������\n"
-"                   ������������� ������� ������� mandrake.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "��������� ������ ����� �������� �������"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - ������������ ��������� �����������, �� ���������\n"
-"                   ������������ ����������� �������������� ������\n"
-"                   ������� mandrake.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "������� Enter, ����� ������ ������..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - �������� ���������� ���� ����������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "����������, �������� ���������� � ������ \"%s\" � ���������� [%s]"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "���������� �������� �������� ������, ��������� ����������"
 
-#: ../urpmi.addmedia_.c:75
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"  -h             - ���������� ����� � ������������ ������-����\n"
-"                   ��� ���� hdlist.\n"
-
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - ������������� ������� ����� hdlist.\n"
-
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "���������� �������� ���������� ������������ cooker\n"
+"��� �������������� ������������ ����� ����������� ��������� ������ (%d ��)"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"��� ���������� ����� ����� root'�, ����� ���������� ��������� �����������:\n"
 "%s\n"
-"�� ����� ��������� <������������� ���� � hdlist> � --distrib"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "���������� �������� ���������� \"%s\"\n"
-
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"��������� ������ ������ ���� ������� ��-�� ������ �����������:\n"
 "%s\n"
-"<������������� ���� � hdlist> �����������\n"
+"�� ��������?"
+
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr "�������������"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "��-�� ���������� � %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "��-�� ���������� %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "��-�� ������������������� %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "��� ����, ����� ���������� %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"��������� ������������� ������ �� ����� ���� �����������:\n"
 "%s\n"
-"`with' ����������� ��� ���������� ftp\n"
+"�� ��������?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "���������� ������� ���������� \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"�������������: urpmi.removemedia [-a] <���> ...\n"
-"��� <���> - ��� ���������� ����������.\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "��������, ��������� �����, ���������� ���\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - ������� ��� ����������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "��� �����? (1-%d) "
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"����������� ����� '%s'\n"
+msgid "One of the following packages is needed:"
+msgstr "����� ���� �� ��������� �������:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"������ ������� (����������� urpmi.addmedia, ����� �������� ����������)\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "���������� ���������� ���� �� ��������� ������� %s:"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"��������� ����� �����������\n"
-"(���� �� %s)\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "������ ����������������� ����������� ������������� ������"
 
-#
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"�������������: urpmi.update [�����] <���> ...\n"
-"��� <���> - ��� ������������ ����������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "������������ ������ �������� �� %s\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - �������� ������ ���������� ��� ����������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "���������� ������� ���������� [%s] ��� ������ �� ������"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - ������� ��� ��������� ��������� ������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "��� ������ � ��������� ������� rpm ��� ������������� --install-src"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - ������������� ��������� ������ ������ ����� depslist."
-"ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ����������� ����� \"-%s\", ��������� ������������� � --help\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"������ ��������� (����������� urpmi.addmedia, ����� �������� ����������)\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"����� ��� ���������� �����������\n"
-"(���� �� %s)\n"
+"  ������������ ��� ����� rpm, ��������� � ��������� ������, ����� "
+"�����������.\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1 ../urpmq: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"
-msgstr ""
-"urpmi ������ %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"��� �������� ����������� ����������� � ��� ����� ���������������� ��� "
-"���������� ������� GNU GPL.\n"
-"\n"
-"�������������:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - ��������� �����.\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - ������������ ��������� ������-���� ������ �� urpmi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - ����� \"��������\".\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --auto-select  - ������������� ������� ������ ��� ���������� �������.\n"
+"  -s             - ��������� ����� �������� �������� �������(���������� --"
+"src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
-"  --fuzzy        - ������ ����� �� ������ �������� ������ (���������� -y).\n"
+"  -y             - ������ ����� �� ������ �������� ������(���������� --"
+"fuzzy).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - ��������� ����� �������� �������� ������� (���������� -"
-"s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - �� ������ � provides, ����� ����� �����.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - ���������� ������ ������ � �������� �����\n"
-"                          (�� �������� �����).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - ��������� ����� � provides, ����� ����� ������.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - ������� ������� rpm �� ����.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - ������� ��� ������������ �� ��������� ������.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - ��������� � ���� ���������������� rpm.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - ��������� ����, ����������� ��������.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force        - ������������� ���������, ���� ���� ��������� ������ �� "
-"����������.\n"
+"  --verify-rpm   - ��������� ������� rpm ����� ����������\n"
+"                   (--no-verify-rpm �������� ��, �� ��������� ��������).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - ��������� ���������� ������������ �������������\n"
-"                   ������ ��� �������� ������������.\n"
+"  --best-output  - ������� ��������� ��������� �������� ������� �����:\n"
+"                   � ��� ��������� �����.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - ������������ �-���������.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --allow-force  - ��������� ���������� ������������ �������������\n"
-"                   ������ ��� �������� ������������ � �����������.\n"
+"  --env          - ������������ ������ �������� (������ �����\n"
+"                   �� ������).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1163,454 +1298,490 @@ msgstr ""
 "  --bug          - �������� ����� �� ������� � ����������, ������������\n"
 "                   ��������� ����������.\n"
 
-#: ../urpmi_.c:98
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - ������������ ������ �������� (������ �����\n"
-"                   �� ������).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - ������������ �-���������.\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --best-output  - ������� ��������� ��������� �������� ������� �����:\n"
-"                   � ��� ��������� �����.\n"
+"  --proxy-user   - ������� ������������ � ������, ������������ ��� ������\n"
+"                   �������������� (������ <������������:������>).\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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --verify-rpm   - ��������� ������� rpm ����� ����������\n"
-"                   (--no-verify-rpm �������� ��, �� ��������� ��������).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - ��������� ����, ����������� ��������.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - ������� ��� ������������ �� ��������� ������.\n"
+"  --proxy        - ������������ ������������ HTTP-������, �� ���������\n"
+"                   ������������ ���� 1080 (������ <������-������[:����]>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - ��������� ����� � provides, ����� ����� ������.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - ���������� �������� ����������.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - �� ������ � provides, ����� ����� �����.\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 ��� ��������� ��������� ������.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"  -y             - ������ ����� �� ������ �������� ������(���������� --"
-"fuzzy).\n"
+"  --wget          - ������������ wget ��� ��������� ��������� ������.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -s             - ��������� ����� �������� �������� �������(���������� --"
-"src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - ����� \"��������\".\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - ��������� �����.\n"
+"  --allow-force  - ��������� ���������� ������������ �������������\n"
+"                   ������ ��� �������� ������������ � �����������.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  ������������ ��� ����� rpm, ��������� � ��������� ������, ����� "
-"�����������.\n"
+"  --allow-nodeps - ��������� ���������� ������������ �������������\n"
+"                   ������ ��� �������� ������������.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ����������� ����� \"-%s\", ��������� ������������� � --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "��� ������ � ��������� ������� rpm ��� ������������� --install-src"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - ������������� ���������, ���� ���� ��������� ������ �� "
+"����������.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "���������� ������� ���������� [%s] ��� ������ �� ������"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - ��������� � ���� ���������������� rpm.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "������������ ������ �������� �� %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "������ ����������������� ����������� ������������� ������"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - ������� ������� rpm �� ����.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "���������� ���������� ���� �� ��������� ������� %s:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "����� ���� �� ��������� �������:"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - ���������� ������ ������ � �������� �����\n"
+"                          (�� �������� �����).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "��� �����? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - ��������� ����� �������� �������� ������� (���������� -"
+"s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "��������, ��������� �����, ���������� ���\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr ""
+"  --fuzzy        - ������ ����� �� ������ �������� ������ (���������� -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"��������� ������������� ������ �� ����� ���� �����������:\n"
-"%s\n"
-"�� ��������?"
+"  --auto-select  - ������������� ������� ������ ��� ���������� �������.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "��� ����, ����� ���������� %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - ������������ ��������� ������-���� ������ �� urpmi.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "��-�� ������������������� %s"
+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 ������ %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"��� �������� ����������� ����������� � ��� ����� ���������������� ��� "
+"���������� ������� GNU GPL.\n"
+"\n"
+"�������������:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "��-�� ���������� %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "���������� �������� ���������� \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "��-�� ���������� � %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "�������������"
+msgid "unable to create medium \"%s\"\n"
+msgstr "���������� ������� ���������� \"%s\"\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 ""
-"��������� ������ ������ ���� ������� ��-�� ������ �����������:\n"
 "%s\n"
-"�� ��������?"
+"`with' ����������� ��� ���������� ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"��� �������������� ������������ ����� ����������� ��������� ������ (%d ��)"
+"%s\n"
+"<������������� ���� � hdlist> �����������\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 ""
-"��� ���������� ����� ����� root'�, ����� ���������� ��������� �����������:\n"
 "%s\n"
+"�� ����� ��������� <������������� ���� � hdlist> � --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "���������� �������� �������� ������, ��������� ����������"
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        ��������� %s%% �� %s, ETA = %s, �������� = %s"
+msgid "retrieving mirrors at %s ..."
+msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        ��������� %s%%, �������� = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "���������� �������� ���������� ������������ cooker\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 "����������, �������� ���������� � ������ \"%s\" � ���������� [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "������� Enter, ����� ������ ������..."
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"����������� ����� '%s'\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "��������� ������ ����� �������� �������"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - ������������� ������� ����� hdlist.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "������� ���������� ���������?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - ���������� ����� � ������������ ������-����\n"
+"                   ��� ���� hdlist.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (�/�) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - �������� ���������� ���� ����������.\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 ""
-"��������� ��������, ��������� ����� �����������:\n"
-"%s\n"
-"��� ����� ������������� �������� ���� ���� ������ urpmi"
+"  --arch         - ������������ ��������� �����������, �� ���������\n"
+"                   ������������ ����������� �������������� ������\n"
+"                   ������� mandrake.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "��������� �� ���������."
+#: ../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      - ������������ ��������� ������ ������������, �� ���������\n"
+"                   ������������ ������ ������������, ����������\n"
+"                   ������������� ������� ������� mandrake.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "�������������� %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - ������������ ��������� url ��� ������ ������, ��\n"
+"                   ��������� ������������ %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "����������� ��������� ��� �������� ������������? (�/�) "
+#: ../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  - ������������� ������� ���������� ��� ����� ���\n"
+"                   ������������, XXX ����� ���� main, contrib, updates ���\n"
+"                   ��� ������, ��� ��� ���� ��������� ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "����������� ���������� ��� ����� ���������� (--force)? (�/�) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --disrtib      - ������������� ������� ��� ����������  � "
+"�������������                    ����������.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "��� ��� �����������"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - ������� ���������� ��� ����������.\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 ������ %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"��� �������� ����������� ����������� � ��� ����� ���������������� ��� "
-"���������� ������� GNU GPL.\n"
+"�������������: urpmi.addmedia [�����] <���> <url> [with "
+"<�������������_����>]\n"
+"��� <url> �������� ����� ��\n"
+"       file://<����>\n"
+"       ftp://<�����>:<������>@<����>/<����> with <������������� ��� �����  "
+"hdlist>\n"
+"       ftp://<����>/<����> with <������������� ��� ����� hdlist>\n"
+"       http://<����>/<����> with <������������� ��� ����� hdlist>\n"
+"       removable://<����>\n"
 "\n"
-"�������������:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list           - ������� ������ ��������� �������.\n"
+"� [�����] �������� ������ ��\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - ������� ������ ��������� �����������.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"��������� ����� �����������\n"
+"(���� �� %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"  --list-nodes   - ������� ������ ��������� �����, "
-"���������                    --parallel.\n"
+"������ ������� (����������� urpmi.addmedia, ����� �������� ����������)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - ������� ������ ��������� ������������ �������.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - ������� ��� ����������.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - ������� ��������� �������, ������������� � ���� ������\n"
-"                   urpmi, � stdout (������ ��� root'�).\n"
+"�������������: urpmi.removemedia [-a] <���> ...\n"
+"��� <���> - ��� ���������� ����������.\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      - ������� ��� �������� ������ ����� �����������(������ ��� "
-"root'�).\n"
+"����� ��� ���������� �����������\n"
+"(���� �� %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - ����������� ������ � ������������ ������.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"������ ��������� (����������� urpmi.addmedia, ����� �������� ����������)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - ������� �����, ���� ��� ����������� ����� ����� ������.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - ������ ����� ������ � ������ ��� ��������.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - ������ ��������� ������ � �������� �������.\n"
+"  -d             - ������������� ��������� ������ ������ ����� depslist."
+"ordered.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - ������� ������ ������ � ����������.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - ������� ��� ��������� ��������� ������.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - ������� ������ � ����� ������ ������ � ���������.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - �������� ������ ���������� ��� ����������.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  ��������� ������������ ��� ����� rpm, ��������� � ��������� ������.\n"
+"�������������: urpmi.update [�����] <���> ...\n"
+"��� <���> - ��� ������������ ����������.\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes ����� ���� ����������� ������ � --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf ������ %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: ����������� ����� \"-%s\", ��������� ������������� � --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"��� �������� ����������� ����������� � ����� ���������������� �������� "
-"�������� GNU GPL"
+"  ��������� ������������ ��� ����� rpm, ��������� � ��������� ������.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "�������������: urpmf [�����] <����>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - ������� ������ � ����� ������ ������ � ���������.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - �� �������� ��� name (�� ���������, ���� ��� �� ����� � "
-"���������"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - ������� ������ ������ � ����������.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    ������, �� ��������� � ������������� �������)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - ������ ��������� ������ � �������� �������.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - �������� ��� ����."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - ������ ����� ������ � ������ ��� ��������.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - �������� ��� name: ��� ����� rpm (��������, ���� ��� �� "
-"�����"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    � ��������� ������, �� ��� ����� ������."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - �������� ��� group: ������."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - �������� ��� size: ������."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - �������� ��� serial: �������� �����."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary        - �������� ��� summary: ����� ��������."
+"  -u             - ������� �����, ���� ��� ����������� ����� ����� ������.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - �������� ��� description: ��������."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - ����������� ������ � ������������ ������.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --provides       - �������� ��� provides: ��� ������������ ����� "
-"(������������� �����)."
+"  --sources      - ������� ��� �������� ������ ����� �����������(������ ��� "
+"root'�).\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --requires       - �������� ��� requires: ��� ����������� �����"
-"(������������� �����)."
+"  --headers      - ������� ��������� �������, ������������� � ���� ������\n"
+"                   urpmi, � stdout (������ ��� root'�).\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --files         - �������� ��� files: ��� ����� (������������� �����)"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - ������� ������ ��������� ������������ �������.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --conflicts     - �������� ��� conflicts: ��� ������������� �����"
-"(������������� �����)"
+"  --list-nodes   - ������� ������ ��������� �����, "
+"���������                    --parallel.\n"
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr ""
-"  --obsoletes     - �������� ��� obsoletes: ��� ���������� �����"
-"(������������� �����)"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - ������� ������ ��������� �����������.\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list           - ������� ������ ��������� �������.\n"
+
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
-"  --preregs       - �������� ��� preregs: ��� �������������� "
-"������������������ (������������� �����)."
+"urpmq ������ %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"��� �������� ����������� ����������� � ��� ����� ���������������� ��� "
+"���������� ������� GNU GPL.\n"
+"\n"
+"�������������:\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "���������� urpmf -help ��� �������������� �����"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "��������� �� ���� %s �� �����������."
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "��� ������ �������� ������ �����������"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp ���������� ��������, �������� ���� ����������"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl ��� ����: �������� � %d ��� �������� %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput ���������� ��������, �������� ���� ����������"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync �����������\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "�� ���� %s"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync ��� ����: �������� � %d ��� �������� %d\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp ���������� �������� �� ����� %s"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh �����������\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "�� ����� %s ����������� ������� ������ urpi"
diff --git a/po/sk.po b/po/sk.po
index 3811b40b..ca676e4c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\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-02-27 20:12+0100\n"
 "Last-Translator: Pavol Cvengros <orpheus@hq.alert.sk>\n"
 "Language-Team: sk <i18n@mandrake.sk>\n"
@@ -14,1133 +14,1255 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "in�talujem %s\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 "Yy��aA"
 
-#: ../_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 "Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf verzia %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (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 "Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL."
+
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "pou�itie: urpmf [vo�by] <s�bor>"
+
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
-"Automatick� in�tal�cia bal��kov...\n"
-"Po�adujete in�tal�ciu bal��ka %s\n"
+"  --quiet         - nevypisuj meno tagu (�tandardne ak nie je zadan� tag v "
+"pr�kazovom"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Je to v poriadku?"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
+"                    riadku, nie je kompatibiln� s interakt�vnym m�dom)."
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - vyp�sa� v�etky tagy."
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Zru�"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - vyp�sa� meno tagu: rpm s�bor (potrebn� ak nie je zadan� "
+"tag"
 
-#: ../_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 "Nn"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    v pr�kazovom riadku bez n�zvu bal��ka)."
 
-#: ../_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 "Yy��aA"
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - vyp�sa� skupinu tagu: skupina."
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (�/n) "
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - vyp�sa� ve�kos� tagu: ve�kos�."
 
-#: ../_irpm_.c:63
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - vyp�sa� s�riov� ��slo tagu: s�riov� ��slo."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - vyp�sa� sum�r tagu: sum�r."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - vyp�sa� popis tagu: popis."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - vyp�sa� �o tag poskytuje : �o poskytuje (viac riadkov)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - vyp�sa� �o tag potrebuje: �o potrebuje (viac riadkov)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - vyp�sa� s�bory tagu: v�etky s�bory (viac riadkov)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr "  --conflicts     - vyp�sa� konflikty tagu: konflikty (viac riadkov)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr "  --obsoletes     - vyp�sa� �o nahradzuje: nahradzuje (viac riadkov)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - vyp�sa� po�iadavky tagu: po�iadavky (viac riadkov)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "sk�ste urpmf --help pre zobrazenie mo�nost�"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "nebol n�jden� naplnen� zoznam m�di�"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: pr�kaz nebol n�jden�\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Nezn�my webfetch `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (�/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "nezn�my protokol definovan� pre %s"
+msgid "Cancel"
+msgstr "Zru�"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "nebol n�jden� webfetch program (aktu�lne curl alebo wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nezn�my protokol: %s"
+msgid "Is this OK?"
+msgstr "Je to v poriadku?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kop�rovanie zlyhalo: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automatick� in�tal�cia bal��kov...\n"
+"Po�adujete in�tal�ciu bal��ka %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "ch�ba wget\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "in�talujem %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ne�spe�n�: skon�il s %d alebo sign�lom %d\n"
+msgid "unable to open rpmdb"
+msgstr "nem��em otvori� rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "ch�ba curl\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "nem��em prist�pi� k rpm s�boru [%s]"
 
-#: ../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 konfliktuje s %s"
 
-#: ../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 je potrebn� pre %s"
 
-#: ../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 "nem��em nain�talova� bal��ek %s"
 
-#: ../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 "nem��em odin�talova� bal��ek %s"
 
-#: ../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 "nem��em prist�pi� k rpm s�boru [%s]"
+msgid "...retrieving failed: %s"
+msgstr "Odstr�nenie nebolo �spe�n�"
 
-#: ../urpm.pm_.c:600
-#, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nem��em prist�pi� k rpm s�boru [%s]"
+#: ../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 "nem��em vytvori� m�dium \"%s\"\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 "nem��em vytvori� m�dium \"%s\"\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:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../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 "nem��em vytvori� m�dium \"%s\"\n"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Nasleduj�ce bal��ky obsahuj� %s: %s"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "no package named %s"
+msgstr "nezn�me bal��ky"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
 msgstr "nem��em prist�pi� k rpm s�boru [%s]"
 
-#: ../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 "nem��em prist�pi� k rpm s�boru [%s]"
 
-#: ../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 "nem��em aktualizova� m�dium \"%s\"\n"
-
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--list-nodes nem��e by� pou�it� len s --parallel"
+msgid "mounting %s"
+msgstr "in�talujem %s\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 "nem��em otvori� rpmdb"
-
-#: ../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 "nem��em prist�pi� k rpm s�boru [%s]"
-
-#: ../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 "kop�rovanie zlyhalo: %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 "Odstr�nenie nebolo �spe�n�"
+msgid "unable to write list file of \"%s\""
+msgstr "nem��em vytvori� m�dium \"%s\"\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 "nem��em vytvori� m�dium \"%s\"\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nem��em aktualizova� m�dium \"%s\"\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 "nem��em vytvori� m�dium \"%s\"\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 "kop�rovanie zlyhalo: %s"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nem��em prist�pi� k rpm s�boru [%s]"
 
-#: ../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 "nem��em prist�pi� k rpm s�boru [%s]"
+msgid "...copying failed"
+msgstr "kop�rovanie zlyhalo: %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 "kop�rovanie zlyhalo: %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 "nem��em aktualizova� m�dium \"%s\"\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 "nem��em vytvori� m�dium \"%s\"\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 "nem��em prist�pi� k rpm s�boru [%s]"
+
+#: ../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 "in�talujem %s\n"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--list-nodes nem��e by� pou�it� len s --parallel"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "nem��em aktualizova� m�dium \"%s\"\n"
+
+#: ../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 "nem��em prist�pi� k rpm s�boru [%s]"
 
-#: ../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 "nem��em prist�pi� k rpm s�boru [%s]"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "nem��em prist�pi� k rpm s�boru [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nem��em vytvori� m�dium \"%s\"\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 "nezn�me bal��ky"
-
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Nasleduj�ce bal��ky obsahuj� %s: %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 "nem��em vytvori� m�dium \"%s\"\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 "nem��em vytvori� m�dium \"%s\"\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "nem��em prist�pi� k rpm s�boru [%s]"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "nem��em prist�pi� k rpm s�boru [%s]"
+
+#: ../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 "nem��em odin�talova� bal��ek %s"
+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 "nem��em nain�talova� bal��ek %s"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "syntax error in config file at line %s"
+msgstr "nem��em prist�pi� k rpm s�boru [%s]"
+
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s je potrebn� pre %s"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% hotov�, r�chlos� = %s"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s konfliktuje s %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% z %s hotov�, zost�va = %s, r�chlos� = %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 zlyhal, mo�no nieje uzol dostupn�"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync ne�spe�n�: ukon�en� s %d alebo sign�lom %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 zlyhalo, mo�no nieje uzol dostupn�"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ch�ba ssh\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "na uzle %s"
+msgid "rsync is missing\n"
+msgstr "ch�ba rsync\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 "In�tal�cia zlyhala na uzle %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl ne�spe�n�: ukon�en� s %d alebo sign�lom %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 "In�tal�cia je mo�n�"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "ch�ba curl\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 zlyhalo na hostite�ovy %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget ne�spe�n�: skon�il s %d alebo sign�lom %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 "hostite� %s nem� spr�vnu verziu urpmi"
+msgid "wget is missing\n"
+msgstr "ch�ba wget\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 verzia %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL.\n"
-"\n"
-"pou�itie:\n"
+msgid "copy failed: %s"
+msgstr "kop�rovanie zlyhalo: %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         - vyp�sa� t�to pomoc.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "nezn�my protokol: %s"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatick� v�ber bal��kov vo vo�b�ch.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "nebol n�jden� webfetch program (aktu�lne curl alebo wget)\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "nezn�my protokol definovan� pre %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Nezn�my webfetch `%s' !!!\n"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Odstr�nenie nebolo �spe�n�"
+
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"  --test         - overi� �i m��e by� in�tal�cia preveden� bez probl�mov.\n"
+"Kv�li zachovaniu z�vislost�, by mali by� odin�talovan� nasleduj�ce bal�ky (%"
+"d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - distribuovan� urpmi na r�zne stroje.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Overovanie pre odstr�nenie t�chto bal�kov"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - vyber v�etky bal��ky zodpovedaj�ce v�razu.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Niet ni� na odstr�nenie"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: nezn�ma vo�ba \"-%s\", pou�itie zist�te s --help\n"
+msgid "removing package %s will break your system"
+msgstr "odstr�nenie bal��ka %s naru�� V� syst�m"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "nezn�my bal��ek"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "nezn�me bal��ky"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "odstr�nenie bal��ka %s naru�� V� syst�m"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: nezn�ma vo�ba \"-%s\", pou�itie zist�te s --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Niet ni� na odstr�nenie"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - vyber v�etky bal��ky zodpovedaj�ce v�razu.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Overovanie pre odstr�nenie t�chto bal�kov"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - distribuovan� urpmi na r�zne stroje.\n"
 
-#: ../urpme_.c:105
+#: ../urpme:1 ../urpmi:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Kv�li zachovaniu z�vislost�, by mali by� odin�talovan� nasleduj�ce bal�ky (%"
-"d MB)"
+"  --test         - overi� �i m��e by� in�tal�cia preveden� bez probl�mov.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Odstr�nenie nebolo �spe�n�"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatick� v�ber bal��kov vo vo�b�ch.\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         - vyp�sa� t�to pomoc.\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 verzia %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
+"urpme verzia %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL.\n"
 "\n"
 "pou�itie:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - pou�i� iba aktualiza�n� m�dia.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"callback je :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - pou�i� len zadan� m�dia, oddelen� �iarkou.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - prav� z�tvorka pre uzatvorenie skupiny v�razov.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - pou�i� zadan� synthesis namiesto urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - �av� z�tvorka pre otvorenie skupiny v�razov.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - m�d s viac v�pismi.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - un�rne NOT, pravda ak je v�raz nepravdiv�.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - nevypisuj meno tagu (�tandardne ak nie je zadan� tag v "
-"pr�kazovom\n"
-"                   riadku, nekompatibiln� s interakt�vnym modom.).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - vyp�sa� v�etky tagy.\n"
+"  -o             - bin�rny OR oper�tor, pravdiv� ak jeden z v�razov je "
+"pravdiv�.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - vyp�sa� meno tagu: rpm s�bor (potrebn� ak nie je zadan� "
-"tag\n"
-"                   v pr�kazovom riadku ale bez n�zvu bal��ka).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - vyp�sa� skupinu tagu: skupina.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - vyp�sa� ve�kos� tagu: ve�kos�.\n"
+"  -a             - bin�rny AND oper�tor, pravdiv� ak oba v�razy s� "
+"pravdiv�.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - vyp�sa� epochu tagu: epocha.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - vlo�i� perlov� k�d priamo ako perl -e.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - vyp�sa� sum�r tagu: sum�r.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - vyp�sa� verziu, release a architekt�ru k menu.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - vyp�sa� popis tagu: popis.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignorova� ve�kos� p�sma vo vzrok�ch.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - vyp�sa� �o tag poskytuje : �o poskytuje (viac riadkov).\n"
+"  --obsoletes     - vyp�sa� �o nahradzuje: nahradzuje (viac riadkov).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - vyp�sa� �o tag potrebuje: �o potrebuje (viac riadkov).\n"
+"  --conflicts     - vyp�sa� konflikty tagu: konflikty (viac riadkov).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 "  --files         - vyp�sa� s�bory tagu: v�etky s�bory (viac riadkov).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - vyp�sa� konflikty tagu: konflikty (viac riadkov).\n"
+"  --requires      - vyp�sa� �o tag potrebuje: �o potrebuje (viac riadkov).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - vyp�sa� �o nahradzuje: nahradzuje (viac riadkov).\n"
+"  --provides      - vyp�sa� �o tag poskytuje : �o poskytuje (viac riadkov).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignorova� ve�kos� p�sma vo vzrok�ch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - vyp�sa� popis tagu: popis.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - vyp�sa� verziu, release a architekt�ru k menu.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - vyp�sa� sum�r tagu: sum�r.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - vlo�i� perlov� k�d priamo ako perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - vyp�sa� epochu tagu: epocha.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - vyp�sa� ve�kos� tagu: ve�kos�.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - vyp�sa� skupinu tagu: skupina.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - bin�rny AND oper�tor, pravdiv� ak oba v�razy s� "
-"pravdiv�.\n"
+"  --name          - vyp�sa� meno tagu: rpm s�bor (potrebn� ak nie je zadan� "
+"tag\n"
+"                   v pr�kazovom riadku ale bez n�zvu bal��ka).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - vyp�sa� v�etky tagy.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - bin�rny OR oper�tor, pravdiv� ak jeden z v�razov je "
-"pravdiv�.\n"
+"  --quiet         - nevypisuj meno tagu (�tandardne ak nie je zadan� tag v "
+"pr�kazovom\n"
+"                   riadku, nekompatibiln� s interakt�vnym modom.).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - un�rne NOT, pravda ak je v�raz nepravdiv�.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - m�d s viac v�pismi.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - �av� z�tvorka pre otvorenie skupiny v�razov.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - pou�i� zadan� synthesis namiesto urpmi db.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - prav� z�tvorka pre uzatvorenie skupiny v�razov.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - pou�i� len zadan� m�dia, oddelen� �iarkou.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"callback je :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - pou�i� iba aktualiza�n� m�dia.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"pou�itie: urpmi.addmedia [vo�by] <meno> <url> [with <relat�vnou cestou>]\n"
-"kde <url> je z\n"
-"       file://<cesta>\n"
-"       ftp://<login>:<heslo>@<hostite�>/<cesta> with <relat�vnym menom "
-"s�boru hdlist>\n"
-"       ftp://<hostite�>/<cesta> with <relat�vnym menom s�boru hdlist>\n"
-"       http://<hostite�>/<cesta> with <relat�vnym menom s�boru hdlist>\n"
-"       removable://<cesta>\n"
+"urpmf verzia %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL.\n"
 "\n"
-"a [vo�by] s�\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         - pou�i wget pre prevzatie vzdialen�ch s�borov.\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         - pou�i� curl pre prevzatie vzdialen�ch s�borov.\n"
+"pou�itie:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limitovanie r�chlosti s�ahovania.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "v�etko je u� nain�talovan�"
 
-#: ../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        - pou�i� �pecifikovan� HTTP proxy, ��slo portu pridelen�\n"
-"                   ako �tandardne je 1080 (form�t z�pisu <proxy[:port]>).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "In�tal�cia je mo�n�"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - �pecifik�cia pou��vate�a a hesla pre pou�itie proxy\n"
-"                   autentifik�cie (form�t je <pou��vate�:heslo>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "In�tal�cia zlyhala"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - vytvori� aktualiza�n� m�dium.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Sk�si� \"tvrd�iu\" in�tal�ciu (--force)? (�/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - automaticky vytvori� v�etky m�dia z in�tala�n�ho\n"
-"                   m�dia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Sk�si� in�tal�ciu bez kontroly z�vislost�? (�/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  - automaticky vytvori� m�dium pre XXX �as�\n"
-"                   distrib�cie, XXX m��e by� main, contrib, updates alebo\n"
-"                   �oko�vek in� �o bolo nastaven� ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distrib�cia %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --from         - pou�i� zadan� url pre zoznam mirrorov, �tandardne je to\n"
-"                   %s\n"
+"In�tal�cia nebola �spe�n�, niektor� s�bory ch�baj�:\n"
+"%s\n"
+"Mo�no budete chcie� aktualizova� Va�u urpmi datab�zu"
 
-#: ../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"
-msgstr ""
-"  --version      - pou�i� �pecifikovan� verziu, �tandardne je to verzia\n"
-"                   nain�talovan�ho bal��ka mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (�/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - pou�i� �pecifikovan� architekt�ru, �tandardne je to "
-"architekt�ra\n"
-"                   nain�talovan�ho bal��ka mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Chcete pokra�ova� v in�tal�cii ?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - zmaza� hlavi�ky v adres�ri do�asnej pam�te.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Nasleduj�ce bal��ky obsahuj� zle signat�ry"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - sk�si� n�js� a pou�i� synthesis alebo\n"
-"                   hdlist s�bor.\n"
+# ******************fix me***********
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Stla�te Enter..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - vn�� generovanie hdlist s�borov.\n"
+# **************fix me****************
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Pros�m vlo�te m�dium \"%s\" do zariadenia [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nieje mo�n� prida� aktualiz�ciu cooker distrib�cie\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "nem��em z�ska� zdrojov� bal��ky, preru�ujem"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"nie je potrebn� zada� <relat�vnu cesta k hdlist> s --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nem��em aktualizova� m�dium \"%s\"\n"
+"Kv�li zachovaniu z�vislost�, by mali by� nain�talovan� nasleduj�ce bal�ky (%"
+"d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Mus�te by� root ak chcete nain�talova� tieto aktualiz�cie:\n"
 "%s\n"
-"ch�ba <relat�vna cesta k hdlist>\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 ""
+"Je potrebn� odstr�ni� tieto bal��ky aby bolo mo�n� aktualizova� in�:\n"
 "%s\n"
-"`with' ch�ba pre ftp\n"
+"s�hlas�te ?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nem��em vytvori� m�dium \"%s\"\n"
+msgid "unrequested"
+msgstr "nepo�adovan�"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"pou�itie: urpmi.update [-a] <meno> ...\n"
-"kde <meno> je m�dium pre odstr�nenie.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "kv�li konfliktom s %s"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - vybra� v�etky m�dia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "kv�li ch�bajucemu %s"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nezn�ma vo�ba '%s'\n"
+msgid "due to unsatisfied %s"
+msgstr "kv�li neuspokojen�mu %s"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "niet ni� na odstr�nenie (pou�i urpmi.addmedia na pridanie m�dia)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "pre in�tal�ciu bal��ka %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 ""
-"ch�ba polo�ka pre odstr�nenie\n"
-"(jedna z %s)\n"
+"Niektor� po�adovan� bal��ky nem��u by� nain�talovan�:\n"
+"%s\n"
+"s�hlas�te ?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"pou�itie: urpmi.update [vo�by] <meno> ...\n"
-"kde <meno> je m�dium pre aktualiz�ciu.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Prep��te, zl� vo�ba, sk�ste znova\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - pou�i� len aktualiza�n� m�dia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "V� v�ber? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - vybra� v�etky nevymenite�n� m�dia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Jeden z nasleduj�cich bal�kov je potrebn�:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d             - vn�� pln� vytvorenie s�boru depslist.ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jeden z nasleduj�cich bal�kov je potrebn� nain�talova� %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "niet ni� na aktualiz�ciu (pou�i urpmi.addmedia na pridanie m�dia)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "In�talova� bal�ky m� dovolen� len superu��vate�"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ch�ba polo�ka pre aktualiz�ciu\n"
-"(jeden z %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "pou�itie �pecifick�ho prostredia na %s\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"
-msgstr ""
-"urpmi verzia %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL.\n"
-"\n"
-"pou�itie:\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Nem��em vytvori� adres�r [%s] pre ohl�senie chyby"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - pou�i� zadan� synthesis namiesto urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "�o m��e by� vykonan� s bin�rnymi rpm s�bormy pri pou�it� --install-src"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nezn�ma vo�ba \"-%s\", pou�itie zist�te s --help\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  --auto-select  - automaticky v�ber bal��kov pre aktualiz�ciu syst�mu.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - fuzzy vyh�ad�vanie (to ist� ako -y).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
+"  men� alebo rpm s�bory zadan� z pr�kazov�ho riadku bud� nain�talovan�.\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 "  -v             - verbose mode.\n"
+msgstr "  -v             - vypisova� podrobnosti.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tich� m�d.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --src          - nasleduj�ci bal��ek je zdrojov� bal��ek (to ist� ako -"
-"s).\n"
+"  -s             - nasleduj�ci bal��ek je zdrojov� bal��ek (to ist� ako --"
+"src).\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - in�talova� len zdrojov� bal��ek.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - fuzzy vyh�ad�vanie (to ist� ako --fuzzy).\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - odstr�ni� nepou�it� rpm s�bory v do�asnej pam�ti.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - pre n�jdenie bal��ka neh�ada� v poskytovan�ch.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - necha� nepou�it� rpm s�bory v do�asnej pam�ti.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - pre n�jdenie bal��ka h�ada� aj v poskytovan�ch.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - vn�� v�zvu aj ak niektor� bal��ky neexistuj�.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - vyber v�etky zhody v pr�kazovom riadku.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - povoli� op�tanie sa pou��vate�a na in�tal�ciu bal��ka "
-"bez\n"
-"                   overovania z�vislosti.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - cesty pre vyl��enie oddelen� �iarkov.\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  - povoli� op�tanie sa pou��vate�a na in�tal�ciu bal��ka "
-"bez\n"
-"                   overovania z�vislosti a integrity.\n"
+"  --verify-rpm   - overi� rpm signat�ru pred in�tal�ciou.\n"
+"                   (--no-verify-rpm to zak�e, �tandardne je to povolen�).\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          - vytvori� ozn�menie o chybe do adres�ra uveden�ho\n"
-"                   za argumentom.\n"
+"  --best-output  - zvo�te si najlep�ie rozhranie pre prostredie:\n"
+"                   X alebo textov� m�d.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - pou�i� X rozhranie.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1148,432 +1270,481 @@ msgstr ""
 "  --env          - pou�i� �pecifick� prostredie (typick� pre\n"
 "                   ozn�menie o chybe).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - pou�i� X rozhranie.\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  - zvo�te si najlep�ie rozhranie pre prostredie:\n"
-"                   X alebo textov� m�d.\n"
+"  --bug          - vytvori� ozn�menie o chybe do adres�ra uveden�ho\n"
+"                   za argumentom.\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   - overi� rpm signat�ru pred in�tal�ciou.\n"
-"                   (--no-verify-rpm to zak�e, �tandardne je to povolen�).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - cesty pre vyl��enie oddelen� �iarkov.\n"
+"  --proxy-user   - �pecifik�cia pou��vate�a a hesla pre pou�itie proxy\n"
+"                   autentifik�cie (form�t je <pou��vate�:heslo>).\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - vyber v�etky zhody v pr�kazovom riadku.\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 ""
+"  --proxy        - pou�i� �pecifikovan� HTTP proxy, ��slo portu pridelen�\n"
+"                   ako �tandardne je 1080 (form�t z�pisu <proxy[:port]>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - pre n�jdenie bal��ka h�ada� aj v poskytovan�ch.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limitovanie r�chlosti s�ahovania.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - pre n�jdenie bal��ka neh�ada� v poskytovan�ch.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - pou�i� curl pre prevzatie vzdialen�ch s�borov.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - fuzzy vyh�ad�vanie (to ist� ako --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - pou�i wget pre prevzatie vzdialen�ch s�borov.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -s             - nasleduj�ci bal��ek je zdrojov� bal��ek (to ist� ako --"
-"src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tich� m�d.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - vypisova� podrobnosti.\n"
+"  --allow-force  - povoli� op�tanie sa pou��vate�a na in�tal�ciu bal��ka "
+"bez\n"
+"                   overovania z�vislosti a integrity.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  men� alebo rpm s�bory zadan� z pr�kazov�ho riadku bud� nain�talovan�.\n"
+"  --allow-nodeps - povoli� op�tanie sa pou��vate�a na in�tal�ciu bal��ka "
+"bez\n"
+"                   overovania z�vislosti.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nezn�ma vo�ba \"-%s\", pou�itie zist�te s --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "�o m��e by� vykonan� s bin�rnymi rpm s�bormy pri pou�it� --install-src"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - vn�� v�zvu aj ak niektor� bal��ky neexistuj�.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nem��em vytvori� adres�r [%s] pre ohl�senie chyby"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - necha� nepou�it� rpm s�bory v do�asnej pam�ti.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "pou�itie �pecifick�ho prostredia na %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "In�talova� bal�ky m� dovolen� len superu��vate�"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - odstr�ni� nepou�it� rpm s�bory v do�asnej pam�ti.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jeden z nasleduj�cich bal�kov je potrebn� nain�talova� %s:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Jeden z nasleduj�cich bal�kov je potrebn�:"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - in�talova� len zdrojov� bal��ek.\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "V� v�ber? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - nasleduj�ci bal��ek je zdrojov� bal��ek (to ist� ako -"
+"s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Prep��te, zl� vo�ba, sk�ste znova\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - fuzzy vyh�ad�vanie (to ist� ako -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Niektor� po�adovan� bal��ky nem��u by� nain�talovan�:\n"
-"%s\n"
-"s�hlas�te ?"
+"  --auto-select  - automaticky v�ber bal��kov pre aktualiz�ciu syst�mu.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "pre in�tal�ciu bal��ka %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - pou�i� zadan� synthesis namiesto urpmi db.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "kv�li neuspokojen�mu %s"
+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 verzia %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL.\n"
+"\n"
+"pou�itie:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "kv�li ch�bajucemu %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nem��em aktualizova� m�dium \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "kv�li konfliktom s %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "nepo�adovan�"
+msgid "unable to create medium \"%s\"\n"
+msgstr "nem��em vytvori� m�dium \"%s\"\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 ""
-"Je potrebn� odstr�ni� tieto bal��ky aby bolo mo�n� aktualizova� in�:\n"
 "%s\n"
-"s�hlas�te ?"
+"`with' ch�ba pre ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Kv�li zachovaniu z�vislost�, by mali by� nain�talovan� nasleduj�ce bal�ky (%"
-"d MB)"
+"%s\n"
+"ch�ba <relat�vna cesta k hdlist>\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 ""
-"Mus�te by� root ak chcete nain�talova� tieto aktualiz�cie:\n"
 "%s\n"
+"nie je potrebn� zada� <relat�vnu cesta k hdlist> s --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "nem��em z�ska� zdrojov� bal��ky, preru�ujem"
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% z %s hotov�, zost�va = %s, r�chlos� = %s"
+msgid "retrieving mirrors at %s ..."
+msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% hotov�, r�chlos� = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nieje mo�n� prida� aktualiz�ciu cooker distrib�cie\n"
 
-# **************fix me****************
-#: ../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 "Pros�m vlo�te m�dium \"%s\" do zariadenia [%s]"
-
-# ******************fix me***********
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Stla�te Enter..."
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nezn�ma vo�ba '%s'\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Nasleduj�ce bal��ky obsahuj� zle signat�ry"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - vn�� generovanie hdlist s�borov.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Chcete pokra�ova� v in�tal�cii ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - sk�si� n�js� a pou�i� synthesis alebo\n"
+"                   hdlist s�bor.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (�/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - zmaza� hlavi�ky v adres�ri do�asnej pam�te.\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 ""
-"In�tal�cia nebola �spe�n�, niektor� s�bory ch�baj�:\n"
-"%s\n"
-"Mo�no budete chcie� aktualizova� Va�u urpmi datab�zu"
+"  --arch         - pou�i� �pecifikovan� architekt�ru, �tandardne je to "
+"architekt�ra\n"
+"                   nain�talovan�ho bal��ka mandrake-release.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "In�tal�cia zlyhala"
+#: ../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      - pou�i� �pecifikovan� verziu, �tandardne je to verzia\n"
+"                   nain�talovan�ho bal��ka mandrake-release.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distrib�cia %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - pou�i� zadan� url pre zoznam mirrorov, �tandardne je to\n"
+"                   %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Sk�si� in�tal�ciu bez kontroly z�vislost�? (�/N) "
+#: ../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  - automaticky vytvori� m�dium pre XXX �as�\n"
+"                   distrib�cie, XXX m��e by� main, contrib, updates alebo\n"
+"                   �oko�vek in� �o bolo nastaven� ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Sk�si� \"tvrd�iu\" in�tal�ciu (--force)? (�/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automaticky vytvori� v�etky m�dia z in�tala�n�ho\n"
+"                   m�dia.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "v�etko je u� nain�talovan�"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - vytvori� aktualiza�n� m�dium.\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 verzia %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL.\n"
+"pou�itie: urpmi.addmedia [vo�by] <meno> <url> [with <relat�vnou cestou>]\n"
+"kde <url> je z\n"
+"       file://<cesta>\n"
+"       ftp://<login>:<heslo>@<hostite�>/<cesta> with <relat�vnym menom "
+"s�boru hdlist>\n"
+"       ftp://<hostite�>/<cesta> with <relat�vnym menom s�boru hdlist>\n"
+"       http://<hostite�>/<cesta> with <relat�vnym menom s�boru hdlist>\n"
+"       removable://<cesta>\n"
 "\n"
-"pou�itie:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list           - vyp�sa� v�etky bal��ky.\n"
+"a [vo�by] s�\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - vyp�sa� dostupn� m�dia.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"ch�ba polo�ka pre odstr�nenie\n"
+"(jedna z %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - vyp�sa� dostupn� uzly pre --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "niet ni� na odstr�nenie (pou�i urpmi.addmedia na pridanie m�dia)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - vyp�sa� dostupn� paral�lne aliasy.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - vybra� v�etky m�dia.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - extrahova� hlavi�ky pre bal��ek zo zoznamu urpmi db na\n"
-"                   stdout (iba root).\n"
+"pou�itie: urpmi.update [-a] <meno> ...\n"
+"kde <meno> je m�dium pre odstr�nenie.\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      - da� v�etky zdrojov� bal��ky pred s�ahovan�m (iba root).\n"
+"ch�ba polo�ka pre aktualiz�ciu\n"
+"(jeden z %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - roz��ri� dotaz o z�vislosti pre bal��ek.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "niet ni� na aktualiz�ciu (pou�i urpmi.addmedia na pridanie m�dia)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - odstr�ni� bal��ek ak u� je nain�talovan� nov�ia verzia.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - kompletn� v�stup s bal��kami na odstr�nenie.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverzn� h�adanie �o bal��ek potrebuje.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d             - vn�� pln� vytvorenie s�boru depslist.ordered.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - vyp�sa� skupiny aj s menami.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - vybra� v�etky nevymenite�n� m�dia.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - vyp�sa� verziu a release s menom.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - pou�i� len aktualiza�n� m�dia.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  men� alebo rpm s�bory zadan� v pr�kazovom riadku s� dotazovan�.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"pou�itie: urpmi.update [vo�by] <meno> ...\n"
+"kde <meno> je m�dium pre aktualiz�ciu.\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes nem��e by� pou�it� len s --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf verzia %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: nezn�ma vo�ba \"-%s\", pou�itie zist�te s --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr "Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  men� alebo rpm s�bory zadan� v pr�kazovom riadku s� dotazovan�.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "pou�itie: urpmf [vo�by] <s�bor>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - vyp�sa� verziu a release s menom.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - nevypisuj meno tagu (�tandardne ak nie je zadan� tag v "
-"pr�kazovom"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - vyp�sa� skupiny aj s menami.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr ""
-"                    riadku, nie je kompatibiln� s interakt�vnym m�dom)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverzn� h�adanie �o bal��ek potrebuje.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - vyp�sa� v�etky tagy."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - kompletn� v�stup s bal��kami na odstr�nenie.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - vyp�sa� meno tagu: rpm s�bor (potrebn� ak nie je zadan� "
-"tag"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    v pr�kazovom riadku bez n�zvu bal��ka)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - vyp�sa� skupinu tagu: skupina."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - vyp�sa� ve�kos� tagu: ve�kos�."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - vyp�sa� s�riov� ��slo tagu: s�riov� ��slo."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - vyp�sa� sum�r tagu: sum�r."
+"  -u             - odstr�ni� bal��ek ak u� je nain�talovan� nov�ia verzia.\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - vyp�sa� popis tagu: popis."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - roz��ri� dotaz o z�vislosti pre bal��ek.\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --provides      - vyp�sa� �o tag poskytuje : �o poskytuje (viac riadkov)."
+"  --sources      - da� v�etky zdrojov� bal��ky pred s�ahovan�m (iba root).\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --requires      - vyp�sa� �o tag potrebuje: �o potrebuje (viac riadkov)."
+"  --headers      - extrahova� hlavi�ky pre bal��ek zo zoznamu urpmi db na\n"
+"                   stdout (iba root).\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - vyp�sa� s�bory tagu: v�etky s�bory (viac riadkov)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - vyp�sa� dostupn� paral�lne aliasy.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr "  --conflicts     - vyp�sa� konflikty tagu: konflikty (viac riadkov)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - vyp�sa� dostupn� uzly pre --parallel.\n"
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr "  --obsoletes     - vyp�sa� �o nahradzuje: nahradzuje (viac riadkov)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - vyp�sa� dostupn� m�dia.\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list           - vyp�sa� v�etky bal��ky.\n"
+
+#: ../urpmq: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"
+"\n"
+"usage:\n"
 msgstr ""
-"  --prereqs       - vyp�sa� po�iadavky tagu: po�iadavky (viac riadkov)."
+"urpmq verzia %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL.\n"
+"\n"
+"pou�itie:\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "sk�ste urpmf --help pre zobrazenie mo�nost�"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "In�tal�cia zlyhala na uzle %s"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "nebol n�jden� naplnen� zoznam m�di�"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp zlyhalo, mo�no nieje uzol dostupn�"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl ne�spe�n�: ukon�en� s %d alebo sign�lom %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput zlyhal, mo�no nieje uzol dostupn�"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "ch�ba rsync\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "na uzle %s"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync ne�spe�n�: ukon�en� s %d alebo sign�lom %d\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp zlyhalo na hostite�ovy %s"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ch�ba ssh\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "hostite� %s nem� spr�vnu verziu urpmi"
diff --git a/po/sl.po b/po/sl.po
index 9082b704..5c867e32 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\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-03-05 10:49+0100\n"
 "Last-Translator: Tadej Panjtar <panjtar@email.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -15,1131 +15,1260 @@ 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 "name��am %s\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 "Dd"
 
-#: ../_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 "Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf razli�ica%s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Avtorske pravice (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 ""
-"Samodejno name��anje paketov\n"
-"Vi ste zahtevali namestitev paketa %s\n"
+"To je prosta programska oprame in se sme razmno�evati pod dovoljenjem GNU "
+"GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Je to v redu?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "uporaba: urpmf [opcije] <datoteka>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "V redu"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - ne izpi�e imena oznak (privzeto �e ni podanih oznak v "
+"ukazni"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Prekli�i"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    vrstici, nezdru�ljivo z interaktivnim na�inom)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - izpi�e vse oznake."
 
-#: ../_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 "Dd"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - izpi�e oznako ime: rpm datoteka (predpostavimo da ni "
+"dana oznaka v"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr "(D/n)"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    ukazni vrstici, ampak brez imena paketa)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - izpi�e oznako skupine: skupina."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - izpi�e oznako velikost: velikost."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - izpi�e serijsko oznake: serijsko."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - izpi�e oznake povzetka: povzetek."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   -izpi�e oznake iz opisa: opis."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - izpi�e oznak provides: all provides (ve� vrstic)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - izpi�e oznake requires: all requires (ve� vrstic)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - oznaka za izpis datotek: vse datoteke (ve� vrstic)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - izpi�e oznako conflicts: vse conflicts (ve� vrstic)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - izpi�e oznako obsoletes: vse obsoletes (ve� vrstic)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - izpi�e oznako prereqs: vse prereqs (ve� vrstic)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "poglej urpmf --help za ve� opcij"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "nisem na�el celotnega (polnega) seznama medijev"
 
-#: ../_irpm_.c:63
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: ukaz ni najden\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Neznano spletno prena�anje `%s' !!!\n"
+msgid " (Y/n) "
+msgstr "(D/n)"
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "neznan definiran protokol za %s"
+msgid "Cancel"
+msgstr "Prekli�i"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "ni� spletnih prenosov ni izvedenih (z curl ali wget)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "V redu"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nemogo�e obravnavati protokol: %s"
+msgid "Is this OK?"
+msgstr "Je to v redu?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "spodletelo kopiranje %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Samodejno name��anje paketov\n"
+"Vi ste zahtevali namestitev paketa %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget je pogra�an (ni name��en na sistemu)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "name��am %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget je neuspel: kon�al se je z %d ali signalom %d\n"
+msgid "unable to open rpmdb"
+msgstr "nemogo�e odpreti rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl je pogra�an ni (name��en na sistemu)\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "nemogo�e je dostopati do rpm datoteke [%s]"
 
-#: ../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 je v konfliktu z/s %s"
 
-#: ../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 potrebuje %s"
 
-#: ../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 "nemogo�e namestiti paket  %s"
 
-#: ../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 "nemogo�e odstraniti paket %s"
 
-#: ../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 "nemogo�e je dostopati do rpm datoteke [%s]"
+msgid "...retrieving failed: %s"
+msgstr "Odstranjevanje je spodletelo "
 
-#: ../urpm.pm_.c:600
-#, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nemogo�e je dostopati do rpm datoteke [%s]"
+#: ../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 "nemogo�e je kreirati medij \"%s\"\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 "nemogo�e je kreirati medij \"%s\"\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:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../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 "nemogo�e je kreirati medij \"%s\"\n"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Slede�i paketi vsebujejo %s: %s"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "no package named %s"
+msgstr "neznani paketi"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
 msgstr "nemogo�e je dostopati do rpm datoteke [%s]"
 
-#: ../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 "nemogo�e je dostopati do rpm datoteke [%s]"
 
-#: ../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 "nemogo�e je posodobiti medij \"%s\"\n"
-
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--list-nodes je lahko uporabljeno samo z --parallel"
+msgid "mounting %s"
+msgstr "name��am %s\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 "nemogo�e odpreti rpmdb"
-
-#: ../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 "nemogo�e je dostopati do rpm datoteke [%s]"
-
-#: ../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 "spodletelo kopiranje %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 "Odstranjevanje je spodletelo "
+msgid "unable to write list file of \"%s\""
+msgstr "nemogo�e je kreirati medij \"%s\"\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 "nemogo�e je kreirati medij \"%s\"\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nemogo�e je posodobiti medij \"%s\"\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 "nemogo�e je kreirati medij \"%s\"\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 "spodletelo kopiranje %s"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nemogo�e je dostopati do rpm datoteke [%s]"
 
-#: ../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 "nemogo�e je dostopati do rpm datoteke [%s]"
+msgid "...copying failed"
+msgstr "spodletelo kopiranje %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 "spodletelo kopiranje %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 "nemogo�e je posodobiti medij \"%s\"\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 "nemogo�e je kreirati medij \"%s\"\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 "nemogo�e je dostopati do rpm datoteke [%s]"
+
+#: ../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 "name��am %s\n"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--list-nodes je lahko uporabljeno samo z --parallel"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "nemogo�e je posodobiti medij \"%s\"\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 "nemogo�e je dostopati do rpm datoteke [%s]"
 
-#: ../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 "nemogo�e je dostopati do rpm datoteke [%s]"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "nemogo�e je dostopati do rpm datoteke [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nemogo�e je kreirati medij \"%s\"\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 "neznani paketi"
-
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Slede�i paketi vsebujejo %s: %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 "nemogo�e je kreirati medij \"%s\"\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 "nemogo�e je kreirati medij \"%s\"\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "nemogo�e je dostopati do rpm datoteke [%s]"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "nemogo�e je dostopati do rpm datoteke [%s]"
+
+#: ../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 "nemogo�e odstraniti paket %s"
+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 "nemogo�e namestiti paket  %s"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "syntax error in config file at line %s"
+msgstr "nemogo�e je dostopati do rpm datoteke [%s]"
+
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s potrebuje %s"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% kon�ano, hitrost = %s"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s je v konfliktu z/s %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% od %s kon�ano ETA= %s, hitrost= %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 je neuspel, mogo�e je vozli��e nedosegljivo"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsyns je neuspel: kon�al se je z %d ali signalom %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 je neuspel, mogo�e je vozli��e nedosegljivo"
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh je pogra�an (ni name��en na sistemu)\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "na vozli��u %s"
+msgid "rsync is missing\n"
+msgstr "rsync je pogra�an (ni name��en na sistemu)\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 "Namestitev je spodletela na vozli��u %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl je neuspel: kon�al se je z %d ali signalom %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 "Namestitev je mogo�a"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl je pogra�an ni (name��en na sistemu)\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 spodletel na gostitelju %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget je neuspel: kon�al se je z %d ali signalom %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 "gostitelj %s nima dovolj nove razli�ice urpmi"
+msgid "wget is missing\n"
+msgstr "wget je pogra�an (ni name��en na sistemu)\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 razli�ica%s\n"
-"Avtorske pravice (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"To je prosta programska oprame in se sme razmno�evati pod dovoljenjem GNU "
-"GPL\n"
-"\n"
-"uporaba:\n"
+msgid "copy failed: %s"
+msgstr "spodletelo kopiranje %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         - prika�e to sporo�ilo s pomo�jo.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "nemogo�e obravnavati protokol: %s"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - avtomatsko izbere paket v mo�nostih.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "ni� spletnih prenosov ni izvedenih (z curl ali wget)\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "neznan definiran protokol za %s"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Neznano spletno prena�anje `%s' !!!\n"
+
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Odstranjevanje je spodletelo "
+
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - preveri, �e je lahko namestitev pravilno dose�ena.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Zaradi zadovoljitve odvisnosti bodo odstranjeni slede�i paketi (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - porazdeljen urpmi po napravah z vzdevki.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Preverjam za odstranitev slede�ih paketov"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - izberi vse pakete ki ustrezajo izrazu.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ni�esr za odstraniti"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: nepoznana opcija \"-%s\", preveri uporabo z --help\n"
+msgid "removing package %s will break your system"
+msgstr "odstranitev paketa %s bo zru�ilo tvoj sistem"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "neznan paket"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "neznani paketi"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "odstranitev paketa %s bo zru�ilo tvoj sistem"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: nepoznana opcija \"-%s\", preveri uporabo z --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Ni�esr za odstraniti"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - izberi vse pakete ki ustrezajo izrazu.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Preverjam za odstranitev slede�ih paketov"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - porazdeljen urpmi po napravah z vzdevki.\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 "Zaradi zadovoljitve odvisnosti bodo odstranjeni slede�i paketi (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - preveri, �e je lahko namestitev pravilno dose�ena.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Odstranjevanje je spodletelo "
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - avtomatsko izbere paket v mo�nostih.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - prika�e to sporo�ilo s pomo�jo.\n"
+
+#: ../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 razli�ica%s\n"
-"Avtorske pravice (C) 2002 MandrakeSoft.\n"
+"urpme razli�ica%s\n"
+"Avtorske pravice (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "To je prosta programska oprame in se sme razmno�evati pod dovoljenjem GNU "
 "GPL\n"
 "\n"
 "uporaba:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - uporabi samo medij za posodobitev.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"klic nazaj je :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - uporabi samo podane medije, lo�ene z vejico.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - desni oklepaj za zapiranje skupine izrazov.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - levi oklepaj za odpiranje skupine izrazov.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - zgovorni na�in.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - NOT operator, pravilen �e je izraz napa�en.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet        - ne izpi�i imena opravila (privzeto, �e ni podanega "
-"opravilav ukazni\n"
-"                   vrstici, nezdru�ljivo z interaktivnim na�inom).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - izpi�i vse oznake.\n"
+"  -o             - binarni ALI operator, pravilen �e je en izraz pravilen.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name         - izpi�e ime oznake: rpm datoteka (predpostavimo da ni dana "
-"oznaka v\n"
-"                   ukazni vrstici, ampak brez imena paketa).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - izpi�e osnako skupine: skupina.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - izpi�e oznako velikosti: velikost.\n"
-
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - izpi�e oznako epoch: epoch.\n"
-
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - izpi�e oznako povzetka: povzetek.\n"
+"  -a             - binarni IN operator, pravilen �e sta pravilna oba "
+"izraza.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - izpi�e oznako opisa: opis.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - vklju�i perl kodo direktno kot perl -e.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --provides     - izpi�e oznako provides: vse provides (multiple lines).\n"
+"  -f             - izpi�i razli�ico, izdajo in arhitekturo z vsakim imenom.\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
-"  --requires     - izpi�e oznako requires: all requires (ve� vrstic).\n"
+"  -i             - ignoriraj razlike malih/velikih �rk v vsakem vzorcu.\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --files        - izpi�e oznako datoteke: vse datoteke (ve� vrstic).\n"
+"  --obsoletes    - izpi�e oznako obsoletes: vse obsoletes (ve� vrstic).\n"
 
-#: ../urpmf_.c:49
+#: ../urpmf:1
+#, c-format
 msgid ""
 "  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
 "  --conflicts    - izpi�e oznako konfliktov: vse conflicts (ve� vrstic).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
-"  --obsoletes    - izpi�e oznako obsoletes: vse obsoletes (ve� vrstic).\n"
+"  --files        - izpi�e oznako datoteke: vse datoteke (ve� vrstic).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  -i             - ignoriraj razlike malih/velikih �rk v vsakem vzorcu.\n"
+"  --requires     - izpi�e oznako requires: all requires (ve� vrstic).\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  -f             - izpi�i razli�ico, izdajo in arhitekturo z vsakim imenom.\n"
+"  --provides     - izpi�e oznako provides: vse provides (multiple lines).\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - vklju�i perl kodo direktno kot perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - izpi�e oznako opisa: opis.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - izpi�e oznako povzetka: povzetek.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - izpi�e oznako epoch: epoch.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - izpi�e oznako velikosti: velikost.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - izpi�e osnako skupine: skupina.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - binarni IN operator, pravilen �e sta pravilna oba "
-"izraza.\n"
+"  --name         - izpi�e ime oznake: rpm datoteka (predpostavimo da ni dana "
+"oznaka v\n"
+"                   ukazni vrstici, ampak brez imena paketa).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - izpi�i vse oznake.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - binarni ALI operator, pravilen �e je en izraz pravilen.\n"
+"  --quiet        - ne izpi�i imena opravila (privzeto, �e ni podanega "
+"opravilav ukazni\n"
+"                   vrstici, nezdru�ljivo z interaktivnim na�inom).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - NOT operator, pravilen �e je izraz napa�en.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - zgovorni na�in.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - levi oklepaj za odpiranje skupine izrazov.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - desni oklepaj za zapiranje skupine izrazov.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - uporabi samo podane medije, lo�ene z vejico.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"klic nazaj je :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - uporabi samo medij za posodobitev.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"uporaba: urpmi.addmedia [opcije] <ime> <url> [z <relativna_pot>]\n"
-"kjer je <url> ena izbira od\n"
-"       file://<pot>\n"
-"       ftp://<uporabni�ko_ime>:<geslo>@<gostitelj>/<pot> z <relativno potjo  "
-"od hdlist>\n"
-"       ftp://<gostitelj>/<pot> z<relativno_potjo_od_hdlist>\n"
-"       http://<gostitelj>/<pot> z<relativno_potjo_od_hdlist>\n"
-"       removable://<pot>\n"
+"urpmf razli�ica%s\n"
+"Avtorske pravice (C) 2002 MandrakeSoft.\n"
+"To je prosta programska oprame in se sme razmno�evati pod dovoljenjem GNU "
+"GPL\n"
 "\n"
-"in so [opcije] iz\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         - uporabi wget za pobiranje datotek.\n"
+"uporaba:\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         - uporabi curl za pobiranje datotek.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "Vse je �e name��eno"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - omeji hitrost pobiranja.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Namestitev je mogo�a"
 
-#: ../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        - upodabi dolo�en HTTP posrednik, vti�nik je domnevno\n"
-"                       privzeto 1080 (format je <posrednik[:vti�nik]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Neuspela namestitev"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - dolo�i uporabnika in geslo za uporabo avtentifikacije\n"
-"                   pri posredniku (formatje <uporabnik:geslo>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Poizkusi s strogo namestitvijo (--force)? (d/N) "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - kreiraj medij za posodabljanje.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Poizkusi z namestitvijo brez preverjan odvisnosti? (d/N) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - avtomatsko kreiraj vse medije iz namestitvenega\n"
-"                   medija.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distributiram %s\n"
 
-#: ../urpmi.addmedia_.c:64
+#: ../urpmi: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"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --distrib-XXX  - avtomatsko kreiraj medij za XXX del\n"
-"                   distribucije, XXX so lahko glavni mediji, prispevki, "
-"posodobitve ali\n"
-"                   karkoli drugega, kar je bilo pripravljeno ;-)\n"
+"Neuspela namestitev, nekatere datoteke so pogre�ane:\n"
+"%s\n"
+"Smete si a�urirati svojo urpmi podatkovno bazo"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - uporabi podan url za dobiti seznam zrcalnih mest, "
-"privzeto je\n"
-"                   %s\n"
+msgid " (y/N) "
+msgstr " (d/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"
-msgstr ""
-"  --version      - uporabi podano razli�ica distribucije, privzeto je vzeta\n"
-"                   iz razli�ice distribucije dobljene pri namestitvi\n"
-"                   paketa mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ali �elite nadaljevati namestitev ?"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - uporabi dolo�eno platformo, kot privzeta arhitekturo se "
-"vzame\n"
-"                   tista, ki jo ima name��en paket mandrake-release .\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Slede�i paketi imajo slabe podpise"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - po�isti imenik z medpomnilnikom zglavij.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Pritisni Enter ko bo� pripravljen..."
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - poskusi najti in uporabiti synthesis ali hdlist\n"
-"                   datoteki.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Prosim vstavi medij poimenovan \"%s\" v napravo [%s]"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - prisili tvorbo hdlist datotek.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "nemogo�e je dobiti izvorne pakete, preklic"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "ne morem dodati distribucije s posodobitvami ali cooker\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "Za zadovolitev odvisnosti nameravam namestiti naslednje pakete (%d MB)"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"Mora� biti prijavljen kot root za namestitev slede�ih odvisti:\n"
 "%s\n"
-"ni potrebe dajati <relativna pot do hdlist> z --distrib"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nemogo�e je posodobiti medij \"%s\"\n"
-
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"Slede�i paketi morajo biti odstranjeni zaradi posodabljanj z novej�imi :\n"
 "%s\n"
-"<relativna pot do hdlist> je pogre�anja\n"
+"ali se strinja� ?"
+
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr "nezahtevan"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "glede na konflikte z/s %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "glede na manjkajo�e %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "zaradi nezadovoljstva %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "glede na namestitev %s"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"Nekateri zahtevani paketi ne morejo biti name��eni:\n"
 "%s\n"
-"`with' manjka za ftp medij\n"
+"ali se strinja� ?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nemogo�e je kreirati medij \"%s\"\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Oprostite, slaba izbira, poskusi znova\n"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"uporaba: urpmi.removemedia [-a] <ime> ...\n"
-"kjer je <ime> ime medija za odstranitev.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Kak�na je tvoja izbira? (1-%d) "
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - izberi celoten medij.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Potreben je en od slede�ih paketov:"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznane opcije '%s'\n"
+msgid "One of the following packages is needed to install %s:"
+msgstr "Za namestitev je potreben en od slede�ih paketov %s:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ni�esar za odstraniti (uporabi urpmi.addmedia za dodajanje medija)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Samo superuporabniku je dovoljeno name��ati pakete"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"pogre�an je vnos za odstranitev \n"
-"(en od %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "uporabljam specifi�no okolje pri %s\n"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"uporaba: urpmi.update [opcije] <ime> ...\n"
-"kjer je <ime> ime medija za posodabljanje.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Nemogo�e je kreirati imenik [%s] za poro�ilo o napaki"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - posodobi samo posodobitveni medij.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Kaj je lahko narejeno z binarno rpm datoteko pri uporabi --install-src"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-"  -a             - izberi vse ne-izmenljive medije (niso na CD-ROM-ih).\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: neznana opcija \"-%s\", preveri uporabo z --help\n"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  -d             - prisili dokon�anje izdelave depslist.ordered datoteke.\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ni� ni za posodobit (uporabi urpmi.addmedia da doda� nov medij)\n"
-
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"pogre�an je vnos za posodobitev\n"
-"(eden od %s)\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  imena ali rpm datoteke podane iz ukazne vrstice bodo name��ene.\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1 ../urpmq: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"
-msgstr ""
-"urpmi razli�ica%s\n"
-"Avtorske pravice (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"To je prosta programska oprame in se sme razmno�evati pod dovoljenjem "
-"GNUGPL.\n"
-"\n"
-"uporaba:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - zgovoren na�in.\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi na�in.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - avtomatsko izberi pakete za posodobitev sistema.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - naslednji paket je izvorni paket (isto kot --src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - vsili ohlapno iskanje (isto kot -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - vsili ohlapno iskanje (isto kot --fuzzy).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - naslednji paket je izvorni paket (isto kot -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ne i��i v polje provides da najde paket.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - namesti samo izvorni paket (ne binarnih).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - dovoli iskanje v polje provides da najde paket.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - odstrani pred drugim dejanjem rpm pakete iz "
-"medpomnilnika.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - izberi vsa ujemanja v ukazni vrstici.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - hrani neuporabljane rpm pakete v medpomniliku.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - izlo�i poti lo�ene z vejico.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force        - prisili v dejanje celo �e nekateri paketi ne obstajajo.\n"
+"  --verify-rpm   - preveri rpm podpis pred namestitvijo\n"
+"                   (--no-verify-rpm onemogo�i, privzeto omogo�en).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - dovoli si vpra�ati uporabnika za namestitev paketov brez\n"
-"                   preverjanja odvisnosti.\n"
+"  --best-output  - izbere najbolj�i vmestnik glede na okolje:\n"
+"                   X ali tekstni na�in.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - uporabi X vmestnik\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --allow-force  - dovoli si vpra�ati uporabnika za namestitev paketov "
-"brez \n"
-"                   preverjanja odvisnosti in integritete.\n"
+"  --env          - uporabi specifi�no okolje (tipi�no poro�ilo\n"
+"                   o napaki).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1147,435 +1276,477 @@ msgstr ""
 "  --bug          - pripravi poro�ilo o napaki v imenik prikazanem z\n"
 "                   naslednjim argumentom.\n"
 
-#: ../urpmi_.c:98
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - uporabi specifi�no okolje (tipi�no poro�ilo\n"
-"                   o napaki).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - uporabi X vmestnik\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --best-output  - izbere najbolj�i vmestnik glede na okolje:\n"
-"                   X ali tekstni na�in.\n"
+"  --proxy-user   - dolo�i uporabnika in geslo za uporabo avtentifikacije\n"
+"                   pri posredniku (formatje <uporabnik:geslo>).\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        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --verify-rpm   - preveri rpm podpis pred namestitvijo\n"
-"                   (--no-verify-rpm onemogo�i, privzeto omogo�en).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - izlo�i poti lo�ene z vejico.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - izberi vsa ujemanja v ukazni vrstici.\n"
+"  --proxy        - upodabi dolo�en HTTP posrednik, vti�nik je domnevno\n"
+"                       privzeto 1080 (format je <posrednik[:vti�nik]>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - dovoli iskanje v polje provides da najde paket.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - omeji hitrost pobiranja.\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ne i��i v polje provides da najde paket.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - uporabi curl za pobiranje datotek.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - vsili ohlapno iskanje (isto kot --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - uporabi wget za pobiranje datotek.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -s             - naslednji paket je izvorni paket (isto kot --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tihi na�in.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - zgovoren na�in.\n"
-
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  imena ali rpm datoteke podane iz ukazne vrstice bodo name��ene.\n"
+"  --allow-force  - dovoli si vpra�ati uporabnika za namestitev paketov "
+"brez \n"
+"                   preverjanja odvisnosti in integritete.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: neznana opcija \"-%s\", preveri uporabo z --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Kaj je lahko narejeno z binarno rpm datoteko pri uporabi --install-src"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - dovoli si vpra�ati uporabnika za namestitev paketov brez\n"
+"                   preverjanja odvisnosti.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nemogo�e je kreirati imenik [%s] za poro�ilo o napaki"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - prisili v dejanje celo �e nekateri paketi ne obstajajo.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "uporabljam specifi�no okolje pri %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Samo superuporabniku je dovoljeno name��ati pakete"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - hrani neuporabljane rpm pakete v medpomniliku.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Za namestitev je potreben en od slede�ih paketov %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - odstrani pred drugim dejanjem rpm pakete iz "
+"medpomnilnika.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Potreben je en od slede�ih paketov:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - namesti samo izvorni paket (ne binarnih).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kak�na je tvoja izbira? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - naslednji paket je izvorni paket (isto kot -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Oprostite, slaba izbira, poskusi znova\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - vsili ohlapno iskanje (isto kot -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 ""
-"Nekateri zahtevani paketi ne morejo biti name��eni:\n"
-"%s\n"
-"ali se strinja� ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - avtomatsko izberi pakete za posodobitev sistema.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "glede na namestitev %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "zaradi nezadovoljstva %s"
+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 razli�ica%s\n"
+"Avtorske pravice (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"To je prosta programska oprame in se sme razmno�evati pod dovoljenjem "
+"GNUGPL.\n"
+"\n"
+"uporaba:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "glede na manjkajo�e %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nemogo�e je posodobiti medij \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "glede na konflikte z/s %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "nezahtevan"
+msgid "unable to create medium \"%s\"\n"
+msgstr "nemogo�e je kreirati medij \"%s\"\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 ""
-"Slede�i paketi morajo biti odstranjeni zaradi posodabljanj z novej�imi :\n"
 "%s\n"
-"ali se strinja� ?"
+"`with' manjka za ftp medij\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 "Za zadovolitev odvisnosti nameravam namestiti naslednje pakete (%d MB)"
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
+"%s\n"
+"<relativna pot do hdlist> je pogre�anja\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 ""
-"Mora� biti prijavljen kot root za namestitev slede�ih odvisti:\n"
 "%s\n"
+"ni potrebe dajati <relativna pot do hdlist> z --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "nemogo�e je dobiti izvorne pakete, preklic"
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% od %s kon�ano ETA= %s, hitrost= %s"
+msgid "retrieving mirrors at %s ..."
+msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% kon�ano, hitrost = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "ne morem dodati distribucije s posodobitvami ali cooker\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 "Prosim vstavi medij poimenovan \"%s\" v napravo [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Pritisni Enter ko bo� pripravljen..."
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nepoznane opcije '%s'\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Slede�i paketi imajo slabe podpise"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - prisili tvorbo hdlist datotek.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Ali �elite nadaljevati namestitev ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - poskusi najti in uporabiti synthesis ali hdlist\n"
+"                   datoteki.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (d/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - po�isti imenik z medpomnilnikom zglavij.\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 ""
-"Neuspela namestitev, nekatere datoteke so pogre�ane:\n"
-"%s\n"
-"Smete si a�urirati svojo urpmi podatkovno bazo"
+"  --arch         - uporabi dolo�eno platformo, kot privzeta arhitekturo se "
+"vzame\n"
+"                   tista, ki jo ima name��en paket mandrake-release .\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Neuspela namestitev"
+#: ../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      - uporabi podano razli�ica distribucije, privzeto je vzeta\n"
+"                   iz razli�ice distribucije dobljene pri namestitvi\n"
+"                   paketa mandrake-release.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distributiram %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - uporabi podan url za dobiti seznam zrcalnih mest, "
+"privzeto je\n"
+"                   %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Poizkusi z namestitvijo brez preverjan odvisnosti? (d/N) "
+#: ../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  - avtomatsko kreiraj medij za XXX del\n"
+"                   distribucije, XXX so lahko glavni mediji, prispevki, "
+"posodobitve ali\n"
+"                   karkoli drugega, kar je bilo pripravljeno ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Poizkusi s strogo namestitvijo (--force)? (d/N) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - avtomatsko kreiraj vse medije iz namestitvenega\n"
+"                   medija.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "Vse je �e name��eno"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - kreiraj medij za posodabljanje.\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 razli�ica%s\n"
-"Avtorske pravice (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"To je prosta programska oprame in se sme razmno�evati pod dovoljenjem GNU "
-"GPL.\n"
+"uporaba: urpmi.addmedia [opcije] <ime> <url> [z <relativna_pot>]\n"
+"kjer je <url> ena izbira od\n"
+"       file://<pot>\n"
+"       ftp://<uporabni�ko_ime>:<geslo>@<gostitelj>/<pot> z <relativno potjo  "
+"od hdlist>\n"
+"       ftp://<gostitelj>/<pot> z<relativno_potjo_od_hdlist>\n"
+"       http://<gostitelj>/<pot> z<relativno_potjo_od_hdlist>\n"
+"       removable://<pot>\n"
 "\n"
-"uporaba:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - listaj pakete na voljo.\n"
+"in so [opcije] iz\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - listaj medije na voljo.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"pogre�an je vnos za odstranitev \n"
+"(en od %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - listaj vozli��a na voljo pri uporabi --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ni�esar za odstraniti (uporabi urpmi.addmedia za dodajanje medija)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - listaj vzporedne vzdevke, ki so na voljo.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - izberi celoten medij.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - raz�iri glave paketa listane iz urpmi baze na\n"
-"                   stdout (samo root).\n"
+"uporaba: urpmi.removemedia [-a] <ime> ...\n"
+"kjer je <ime> ime medija za odstranitev.\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      - daj vse izvorne pakete pred pobiranjem dol (samo root).\n"
+"pogre�an je vnos za posodobitev\n"
+"(eden od %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - raz�iri poizvedbo na paketove odvisnosti.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ni� ni za posodobit (uporabi urpmi.addmedia da doda� nov medij)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - odstrani paket, �e je novej�i �ename��en.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+"  -d             - prisili dokon�anje izdelave depslist.ordered datoteke.\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - izvedi nalogo z odstranitvojo poketov.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr ""
+"  -a             - izberi vse ne-izmenljive medije (niso na CD-ROM-ih).\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - iskanje po nazaj kar paket potrebuje.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - posodobi samo posodobitveni medij.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - izpi�e skupine skupaj z imenom.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"uporaba: urpmi.update [opcije] <ime> ...\n"
+"kjer je <ime> ime medija za posodabljanje.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - izpi�e razli�ica in izdajo skupaj z imenom.\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes je lahko uporabljeno samo z --parallel"
+
+#: ../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: nepoznana opcija \"-%s\", preveri uporabo z --help\n"
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  imena ali rpm datoteke podane preko ukazne vrstice so obdelane.\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes je lahko uporabljeno samo z --parallel"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - izpi�e razli�ica in izdajo skupaj z imenom.\n"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf razli�ica%s"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - izpi�e skupine skupaj z imenom.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Avtorske pravice (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - iskanje po nazaj kar paket potrebuje.\n"
 
-#: placeholder.h:20
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - izvedi nalogo z odstranitvojo poketov.\n"
+
+#: ../urpmq:1
+#, c-format
 msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr ""
-"To je prosta programska oprame in se sme razmno�evati pod dovoljenjem GNU "
-"GPL."
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - odstrani paket, �e je novej�i �ename��en.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "uporaba: urpmf [opcije] <datoteka>"
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - raz�iri poizvedbo na paketove odvisnosti.\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         - ne izpi�e imena oznak (privzeto �e ni podanih oznak v "
-"ukazni"
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    vrstici, nezdru�ljivo z interaktivnim na�inom)."
-
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - izpi�e vse oznake."
+"  --sources      - daj vse izvorne pakete pred pobiranjem dol (samo root).\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          - izpi�e oznako ime: rpm datoteka (predpostavimo da ni "
-"dana oznaka v"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    ukazni vrstici, ampak brez imena paketa)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - izpi�e oznako skupine: skupina."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - izpi�e oznako velikost: velikost."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - izpi�e serijsko oznake: serijsko."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - izpi�e oznake povzetka: povzetek."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   -izpi�e oznake iz opisa: opis."
+"  --headers      - raz�iri glave paketa listane iz urpmi baze na\n"
+"                   stdout (samo root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - izpi�e oznak provides: all provides (ve� vrstic)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - listaj vzporedne vzdevke, ki so na voljo.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - izpi�e oznake requires: all requires (ve� vrstic)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - listaj vozli��a na voljo pri uporabi --parallel.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --files         - oznaka za izpis datotek: vse datoteke (ve� vrstic)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - listaj medije na voljo.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr ""
-"  --conflicts     - izpi�e oznako conflicts: vse conflicts (ve� vrstic)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - listaj pakete na voljo.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (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 ""
-"  --obsoletes     - izpi�e oznako obsoletes: vse obsoletes (ve� vrstic)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - izpi�e oznako prereqs: vse prereqs (ve� vrstic)."
+"urpmq razli�ica%s\n"
+"Avtorske pravice (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"To je prosta programska oprame in se sme razmno�evati pod dovoljenjem GNU "
+"GPL.\n"
+"\n"
+"uporaba:\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "poglej urpmf --help za ve� opcij"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Namestitev je spodletela na vozli��u %s"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "nisem na�el celotnega (polnega) seznama medijev"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp je neuspel, mogo�e je vozli��e nedosegljivo"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl je neuspel: kon�al se je z %d ali signalom %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput je neuspel, mogo�e je vozli��e nedosegljivo"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync je pogra�an (ni name��en na sistemu)\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "na vozli��u %s"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsyns je neuspel: kon�al se je z %d ali signalom %d\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp spodletel na gostitelju %s"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh je pogra�an (ni name��en na sistemu)\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "gostitelj %s nima dovolj nove razli�ice urpmi"
diff --git a/po/sp.po b/po/sp.po
index 18ad7cb3..f94f41cf 100644
--- a/po/sp.po
+++ b/po/sp.po
@@ -7,7 +7,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-02-21 21:41+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -16,1131 +16,1269 @@ 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\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 "��YydD"
+
+#. 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 "��Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf �����j� %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright  (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 ""
-"���������� ���������j� �����a...\n"
-"��������� ��� ���������j� ������ %s\n"
+"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� "
+"GNU � GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "�� �� �� ����� �����?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "�������a: urpmf [������] <����>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "� ����"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - �� ��������� ��� ���� (���������� ������ ������� ���� "
+"��� ��� � �������"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "��������"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    ������, �������������� �� ������������� �����)."
 
-#: ../_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 "��Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - ��������� ��� ������."
 
-#: ../_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 "��YydD"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - ��������� ��� ����: rpm ��� �������� (�������������� "
+"������� ���� ����"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (�/�) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    �������� ������ ��� ��� ����� ������)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - ��������� ��� �����: �����."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - ��������� ��� ��������: ��������."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - ��������� �������� ���: ��������."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - ��������� ��� �������: �������."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - ��������� ��� �����: ����."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - ��������� ��� ������: ��� ������ (����� ������)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - ��������� ��� �������: ��� ������� (����� ������)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - ��������� ��� ����: ��� ������� (� ���� ����)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - ��������� ��� ����������: ��� ��������� (� ���� ����)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr "  --obsoletes     - ��������� ��� �����: ��� ������� (� ���� ����)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs         - ��������� ��� �������: ��� ������� (� ���� ����)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "�������� �� urpmf --help �� �� ��� ������ ������ �������� ������"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "����� ����� ���� ����� ������"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: ������� ��j� ����a���a\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "��������� webfetch `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (�/�) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "��������� �������� ��������� �� %s"
+msgid "Cancel"
+msgstr "��������"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "webfetch (�������� �url ��� wget) ���� ��������\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "� ����"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "�� ���� �� ������� ��������: %s"
+msgid "Is this OK?"
+msgstr "�� �� �� ����� �����?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "�������� ��������: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"���������� ���������j� �����a...\n"
+"��������� ��� ���������j� ������ %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "��������� wget\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "���������� %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ���� �����: ������ �� %d ��� �������� %d\n"
+msgid "unable to open rpmdb"
+msgstr "�� ���� �� ������� rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "��������� curl\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "�� ���� �� ��������� rpm �������� [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"����� \"%s\" �������� �� ������� ����� ���� �� ��� �����������, ����� �� "
-"���������"
+msgid "%s conflicts with %s"
+msgstr "%s �� � ��������� �� %s"
 
-#: ../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 ""
-"�� ���� �� �������� ����� \"%s\" ����� �� �������� ����� ������� ����� �����"
+msgid "%s is needed by %s"
+msgstr "%s �� �������� �� %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"�� ���� �� �������� ��� \"%s\" ��� ��� �� ����������� ������� ���� ��� �� �� "
-"��� ��� � ��������"
+msgid "unable to install package %s"
+msgstr "�� ���� �� ���������� ����� %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "�� ���� �� ����� ����� \"%s\" � ����� ����� �� ������� ����� [%s] "
+msgid "unable to remove package %s"
+msgstr "�� ���� �� ������� ����� %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "�� ���� �� ������� ����� �� ���� hdlist ���� [%s]"
+msgid "Preparing..."
+msgstr "���������..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "�� ���� �� ��������� hdlist ����� �� \"%s\", ����� �� ���������"
+msgid "...retrieving failed: %s"
+msgstr "...�������� �������: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "�� ���� �� ��������� ����� ����� �� \"%s\", m���� ���������"
+msgid "...retrieving done"
+msgstr "... ��������� ��������"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "��������� �� ��������� ��������� ����� \"%s\", ���������"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "�������� rpm ������� �� ����� \"%s\"..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "�� ���� �� �������� hdlist �������� �� \"%s\", ������� �� ���������"
+msgid "malformed input: [%s]"
+msgstr "�������� ����: [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "������ �� �������� �������� ����� �� \"%s\", ������� �� ���������"
+msgid "unable to access medium \"%s\""
+msgstr "�� ���� �� ��������� ����j� \"%s\""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "������������ �������� ����� �� \"%s\", ����� �� ���������"
+msgid "urpmi database locked"
+msgstr "urpmi ���� �������� ���������"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "�� ���� �� �������� �������� ����� �� \"%s\", ����� �� ���������"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"������������ ����� \"%s\" �� ������� ��� �������� ��� �� ���� � ����������"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "������� ������ ��������� �� �������� ����� \"%s\""
+msgid "medium \"%s\" is not selected"
+msgstr "����� \"%s\" ���� �������"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "������ �������� ������ ��� \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "�� ���� �� �������� rpm �������� [%s] �� ������ \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "��������� �������� �������� ������ ��� [%s] �� \"%s\""
+msgid "package %s is not found."
+msgstr "����� %s ���� ��������."
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "�� ���� �� ������� ������ �� �������� ����� \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "����� \"%s\" �� �������� �� ����� �������� �� rpm �������"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "�� ���� �� ������� ���� � �������������� �������� [%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:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "�������� � �������������� �������� [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "������� ���� ������ �� ����� ������ rpm �������� \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "�� ���� �� �������� \"%s\" � ���� [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "�� ���� �� �������� �������� [%s] �� �������� \"%s\""
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "��������� ��������� ����� � ����� [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "������� ������ ������ %s: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "�������� ��������� ����� �� ������: %s"
+msgid "no package named %s"
+msgstr "���� ������ �� ������ %s"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "�������� �������� ����� �� ��������� ���: %s"
+msgid "error registering local packages"
+msgstr "������ ��� ������������ �������� ������"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "�� ���� �� ��������� rpm �������� [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "�� ���� �� �������� ��������� ������ \"%s\""
+msgid "retrieving rpm file [%s] ..."
+msgstr "�������� rpm ���� [%s] ..."
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis �� �� ���� ��������� �� --media, --update ��� --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "�������� ��� rpm �������� [%s]"
 
-#: ../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 "no entries relocated in depslist"
+msgstr "���� ����������� ����� � depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "���������� %s ����� � depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "���������� %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "�������� %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "������� %d obsolete h������ � ��� ��������"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "��������� %d ������ � ��� ��������"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "������� hdlist �������� �������� �� ����� \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "���������  hdlist ���� [%s]"
 
-#: ../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]"
 msgstr "��������� synthesis ���� [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "������� ��� ������ hdlist ����� �� ������ \"%s\""
+msgid "building hdlist [%s]"
+msgstr "������� hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "����� ������ �� ������ \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "���� �� ����������� �������������� ������\n"
 
-#: ../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\""
 msgstr "������� �� ������� synthesis ����� �� ����� \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "�� ���� �� ������� rpmdb"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "����� \"%s\" ��� �������"
+msgid "nothing written in list file for \"%s\""
+msgstr "���� ��� �� �� ����� � �������� ����� �� \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "������ ����� %s"
+msgid "writing list file for medium \"%s\""
+msgstr "�������� ����� ������� �� ����� \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "�� ���� �� ��������� ����� ������������� ������"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "�� ���� �� ������ �������� ����� �� \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "������� hdlist ����..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "���� [%s] �� ��� ��������� �� ���� ����� \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...�������� ��������"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "�� ���� �� �������� hdlist �������� �� \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...�������� ��������"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "���� ��������� hdlist �������� �� ����� \"%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)"
-msgstr ""
-"�� ���� �� ��������� ����� ������������� ������ (���� �������� Mandrake/base/"
-"hdlists ����)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "�������� ������� hdlist (��� synthesis) �������"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "�������� hdlists ����..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "��������� MD5SUM ����"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "... ��������� ��������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "�������� ������� hdlist (��� synthesis) �� \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...�������� �������: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "�������� ������ hdlist (��� synthesis) �� \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "���������� hdlist ���� \"%s\" � hdlists �����"
+msgid "retrieving description file of \"%s\"..."
+msgstr "��������� ������� ����� �� \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "��������� �� ���������� inexistant ����� \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "���� rpm �������� �� [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "�� ���� �� �������� rpm ������� �� [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "��������� �� ���������� ���������� �����: %s"
+msgid "reading rpm files from [%s]"
+msgstr "����� rpm ������� �� [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "������� ����� \"%s\""
+msgid "...copying done"
+msgstr "...�������� ��������"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi ���� �������� ���������"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...�������� ��������"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "�� ���� �� ��������� ����j� \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "������� ������� ����� �� \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "������� ������ ���� �� \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "�������� [%s] ��������"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "�������� ������� hdlist (��� synthesis) �� \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "�������� [%s] ��������"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "��������� MD5SUM ����"
+msgid "copying description file of \"%s\"..."
+msgstr "������� ������ ���� �� \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "������� ������� ����� �� \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "������� ����� \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "����� rpm ������� �� [%s]"
+msgid "selecting multiple media: %s"
+msgstr "��������� �� ���������� ���������� �����: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "�� ���� �� �������� rpm ������� �� [%s]: %s"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "���� rpm �������� �� [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "��������� �� ���������� inexistant ����� \"%s\""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "��������� ������� ����� �� \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"�� ���� �� ��������� ����� ������������� ������ (���� �������� Mandrake/base/"
+"hdlists ����)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "�������� ������ hdlist (��� synthesis) �� \"%s\"..."
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "�������� ������� hdlist (��� synthesis) �������"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "���������� hdlist ���� \"%s\" � hdlists �����"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "���� ��������� hdlist �������� �� ����� \"%s\""
+msgid "retrieving hdlists file..."
+msgstr "�������� hdlists ����..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "���� [%s] �� ��� ��������� �� ���� ����� \"%s\""
+msgid "copying hdlists file..."
+msgstr "������� hdlist ����..."
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "�� ���� �� �������� hdlist �������� �� \"%s\""
+msgid "unable to access first installation medium"
+msgstr "�� ���� �� ��������� ����� ������������� ������"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "�� ���� �� ������ �������� ����� �� \"%s\""
+msgid "added medium %s"
+msgstr "������ ����� %s"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "�������� ����� ������� �� ����� \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "����� \"%s\" ��� �������"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "���� ��� �� �� ����� � �������� ����� �� \"%s\""
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "���� �� ����������� �������������� ������\n"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "������� ��� ������ hdlist ����� �� ������ \"%s\""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "����� ������ �� ������ \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis �� �� ���� ��������� �� --media, --update ��� --parallel"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "������� hdlist [%s]"
+msgid "unable to use parallel option \"%s\""
+msgstr "�� ���� �� �������� ��������� ������ \"%s\""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "������� hdlist �������� �������� �� ����� \"%s\""
+msgid "using associated media for parallel mode: %s"
+msgstr "�������� �������� ����� �� ��������� ���: %s"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "��������� %d ������ � ��� ��������"
+msgid "found parallel handler for nodes: %s"
+msgstr "�������� ��������� ����� �� ������: %s"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "������� %d obsolete h������ � ��� ��������"
+msgid "examining parallel handler in file [%s]"
+msgstr "��������� ��������� ����� � ����� [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "�������� %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "�� ���� �� �������� \"%s\" � ���� [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "���������� %s"
+msgid "write config file [%s]"
+msgstr "�������� � �������������� �������� [%s]"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "���������� %s ����� � depslist"
+msgid "unable to write config file [%s]"
+msgstr "�� ���� �� ������� ���� � �������������� �������� [%s]"
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "���� ����������� ����� � depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "�� ���� �� ������� ������ �� �������� ����� \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "�������� ��� rpm �������� [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "��������� �������� �������� ������ ��� [%s] �� \"%s\""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "�������� rpm ���� [%s] ..."
+msgid "taking removable device as \"%s\""
+msgstr "������ �������� ������ ��� \"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "�� ���� �� ��������� rpm �������� [%s]"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "������� ������ ��������� �� �������� ����� \"%s\""
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "�� ���� �� ��������� rpm �������� [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "�� ���� �� �������� �������� ����� �� \"%s\", ����� �� ���������"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "������ ��� ������������ �������� ������"
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "������������ �������� ����� �� \"%s\", ����� �� ���������"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "���� ������ �� ������ %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "������ �� �������� �������� ����� �� \"%s\", ������� �� ���������"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "������� ������ ������ %s: %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "�� ���� �� �������� hdlist �������� �� \"%s\", ������� �� ���������"
 
-#: ../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\""
-msgstr "������� ���� ������ �� ����� ������ rpm �������� \"%s\""
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "��������� �� ��������� ��������� ����� \"%s\", ���������"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "�� ���� �� �������� �������� [%s] �� �������� \"%s\""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "�� ���� �� ��������� ����� ����� �� \"%s\", m���� ���������"
 
-#: ../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)"
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "�� ���� �� ��������� hdlist ����� �� \"%s\", ����� �� ���������"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "����� \"%s\" �� �������� �� ����� �������� �� rpm �������"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "�� ���� �� ������� ����� �� ���� hdlist ���� [%s]"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "����� %s ���� ��������."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "�� ���� �� ����� ����� \"%s\" � ����� ����� �� ������� ����� [%s] "
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "����� \"%s\" ���� �������"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"�� ���� �� �������� ��� \"%s\" ��� ��� �� ����������� ������� ���� ��� �� �� "
+"��� ��� � ��������"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "�� ���� �� �������� rpm �������� [%s] �� ������ \"%s\""
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"�� ���� �� �������� ����� \"%s\" ����� �� �������� ����� ������� ����� �����"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"������������ ����� \"%s\" �� ������� ��� �������� ��� �� ���� � ����������"
+"����� \"%s\" �������� �� ������� ����� ���� �� ��� �����������, ����� �� "
+"���������"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "�������� ����: [%s]"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"����� \"%s\" �������� �� ������� hdlist ���� �� ��� ���������, ����� �� ���� "
+"���������"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "�������� rpm ������� �� ����� \"%s\"..."
+msgid "syntax error in config file at line %s"
+msgstr "��������� ������ � ��������������� ����� � ���� %s"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "���������..."
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% ��������, ������ = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "�� ���� �� ������� ����� %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% �� %s ��������, ETA = %s, ������ = %s"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "�� ���� �� ���������� ����� %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync ���� �����: ������ �� %d ��� ������ %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s �� �������� �� %s"
+msgid "ssh is missing\n"
+msgstr "��������� ssh\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �� � ��������� �� %s"
+msgid "rsync is missing\n"
+msgstr "��������� rsync\n"
 
-#: ../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 ���� �����, ����� �� ��� ����������"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl ���� �����: ������ �� %d ��� ��������  %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 ���� �����, ����� �� ��� ���������"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "��������� curl\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"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget ���� �����: ������ �� %d ��� �������� %d\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 "����������� �������� �� ���� %s"
+msgid "wget is missing\n"
+msgstr "��������� wget\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 "����������� �� ������"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "�������� ��������: %s"
 
-#: ../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 ���� ����� �� ����� %s"
+msgid "unable to handle protocol: %s"
+msgstr "�� ���� �� ������� ��������: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "���� %s ���� �������� ������� urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "webfetch (�������� �url ��� wget) ���� ��������\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 ""
-"urpmi ������� %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� \n"
-"GNU � GPL.\n"
-"\n"
-"��������:\n"
+msgid "unknown protocol defined for %s"
+msgstr "��������� �������� ��������� �� %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         - ��������� ���� ����� � ������.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "��������� webfetch `%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - ���������� ��������� ������ �� ���������.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "�������� ���� ������"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - ��������� �� �� �� ���� ������� �������� �����������.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "���� ���������� ����������, ������� ������ �� ���� �������� (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - ������������� urpmi ����� ������ �� ��������.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "���������� ���� ��� ������� ������� ������"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - ������� ��� ������ ���� ���������� ������.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "���� ������ ��� �� �� ����� ��������"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
+msgid "removing package %s will break your system"
+msgstr "�������� ������ %s �� �������� ��� ������"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "��������� �����"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "��������� ������"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "�������� ������ %s �� �������� ��� ������"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "���� ������ ��� �� �� ����� ��������"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - ������� ��� ������ ���� ���������� ������.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "���������� ���� ��� ������� ������� ������"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - ������������� urpmi ����� ������ �� ��������.\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 "���� ���������� ����������, ������� ������ �� ���� �������� (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - ��������� �� �� �� ���� ������� �������� �����������.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "�������� ���� ������"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - ���������� ��������� ������ �� ���������.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - ��������� ���� ����� � ������.\n"
+
+#: ../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 ""
-"urpmq ������� %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"��� �� ��������� ������� � ���� ���� �������������� ��� �������� GNU GPL.\n"
+"urpmi ������� %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� \n"
+"GNU � GPL.\n"
 "\n"
 "��������:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - ������� ���� update �����.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"�������� �� :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - ������� ���� ���� �����, ������� �������.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - ����� ������� �� ��������� ����� ������.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - ������� ���� synthesis ������ urpmi-���� ����.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - ���� ������� �� �������� ����� ������.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - verbose �����.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - ������� NOT, ������� ������� �� ����� ��������.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - �� ��������� ��� ���� (���������� ������ ������� ���� "
-"��� ��� � �������\n"
-"                   ������, �������������� �� ������������� �����).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - ��������� ��� ������.\n"
+"  -o             - ������� OR ��������, ������� ������� �� ����� ����� "
+"�����.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - ��������� ��� ����: rpm ��� �������� (�������������� "
-"������� ���� ����\n"
-"                   �������� ������ ��� ��� ����� ������).\n"
+"  -a             - ������ AND o��������, ������� ������� �� ��� ������ "
+"��������.\n"
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - ��������� ��� �����: �����.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - �������� ���� ��� �������� ��� perl -e.\n"
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - ��������� ��� ��������: ��������.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - ��������� �������, ������ � �����������, ���������� � "
+"���.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - ��������� ��� ��������: ��������.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - �������� ������� � ��������� � ���� ����� ����.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - ��������� ��� �������: �������.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr "  --obsoletes     - ��������� ��� �����: ��� ������� (� ���� ����).\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - ��������� ��� �����: ����.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+"  --conflicts     - ��������� ��� ����������: ��� ��������� (� ���� ����).\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr "  --provides      - ��������� ��� ������: ��� ������ (����� ������).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - ��������� ��� ����: ��� ������� (� ���� ����).\n"
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 "  --requires      - ��������� ��� �������: ��� ������� (����� ������).\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - ��������� ��� ����: ��� ������� (� ���� ����).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+msgstr "  --provides      - ��������� ��� ������: ��� ������ (����� ������).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr ""
-"  --conflicts     - ��������� ��� ����������: ��� ��������� (� ���� ����).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - ��������� ��� �����: ����.\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr "  --obsoletes     - ��������� ��� �����: ��� ������� (� ���� ����).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - ��������� ��� �������: �������.\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - �������� ������� � ��������� � ���� ����� ����.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - ��������� ��� ��������: ��������.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - ��������� �������, ������ � �����������, ���������� � "
-"���.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - ��������� ��� ��������: ��������.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - �������� ���� ��� �������� ��� perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - ��������� ��� �����: �����.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - ������ AND o��������, ������� ������� �� ��� ������ "
-"��������.\n"
+"  --name          - ��������� ��� ����: rpm ��� �������� (�������������� "
+"������� ���� ����\n"
+"                   �������� ������ ��� ��� ����� ������).\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - ��������� ��� ������.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - ������� OR ��������, ������� ������� �� ����� ����� "
-"�����.\n"
+"  --quiet         - �� ��������� ��� ���� (���������� ������ ������� ���� "
+"��� ��� � �������\n"
+"                   ������, �������������� �� ������������� �����).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - ������� NOT, ������� ������� �� ����� ��������.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - verbose �����.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - ���� ������� �� �������� ����� ������.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - ������� ���� synthesis ������ urpmi-���� ����.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - ����� ������� �� ��������� ����� ������.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - ������� ���� ���� �����, ������� �������.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"�������� �� :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - ������� ���� update �����.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"�������a: urpmi.addmedia [������] <���> <url> [with <����������_������>]\n"
-"��� je <url> j���� ��\n"
-"       file://<���a�a>\n"
-"       ftp://<login>:<������a>@<host>/<���a�a> with <��������� ��� �������e "
-"�ahdlist>\n"
-"       ftp://<host>/<���a�a> with <��������� ��� �������� �a hdlist>\n"
-"       http://<host>/<���a�a> with <��������� ��� �������� �a hdlist>\n"
+"urpmq ������� %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"��� �� ��������� ������� � ���� ���� �������������� ��� �������� GNU GPL.\n"
 "\n"
-"       removable://<���a�a>\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 �� ��������� �������� �������.\n"
+"��������:\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 �� ��������� �������� �������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "��� �� ��� �����������"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - �������� ������ download-�.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "����������� �� ������"
 
-#: ../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        - ������� ������������� HTTP proxy, ���� ����� �� "
-"������������\n"
-"                   �� �� 1080 �� default-� (������ �� <proxyhost[:port]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "���������j� ���� ������"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - �������� ��������� � ������� ���� �� ������� �� proxy\n"
-"                   ��������������� (������ �� <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "�������� ����������� (--force)? (�a/�e) ?"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - ������ update �����.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "������������ ��� ������� ���������� (�a/�e)? "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - ���������� ������� ��� ������ �� �������������\n"
-"                    ������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "������������ %s\n"
 
-#: ../urpmi.addmedia_.c:64
+#: ../urpmi: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"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --distrib-XXX  - ���������� ������� ������� �� XXX-�� ���\n"
-"                     �������������, XXX ���� �� ���� ������, �������\n"
-"                     ���������� ��� ���� ��� ����� ��� ���� �� �� "
-"������ ;-)\n"
+"����������� ��������, ��������� ���� �������.\n"
+"%s\n"
+"����� ������ �� ��������� ���� urpmi ���� ��������."
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --form        - ������� ���� url ������ �� ���� ������, ������������� ��\n"
-"                    %s\n"
+msgid " (y/N) "
+msgstr " (�/�) "
 
-#: ../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"
-msgstr ""
-"  --version      - ������� ���� ������� ������������, default �� �����\n"
-"                   �� ������� ������������ ���� �� �������� �\n"
-"                   �������������� mandrake-release ������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "�� �� ������ �� ��������� ������������� ?"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch       - ������� ���� �����������, �������������� �� �����������\n"
-"                    ������������ Mandrake ������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "������� ������ ����� ���������� �������"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - ����� ������������ �� ����� ���������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "���������� enter ���� ������ �������..."
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - �������� �� ������� � ��������� synthesis ��� "
-"hdlist                      ����.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "������� ����j �� ������ %s � ������ [%s]"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - ��������� �� ���������� hdlist �������.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "����� ������ ��j� ��������, �������..."
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "�� ���� �� ����� ���������� cooker ������������\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "���� ���������� ����������, ������� ������ �� ���� ����������� (%d MB)"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"������ �� ����� root ��������� �� �� ����������� ������� ������:\n"
 "%s\n"
-"�������j� <��������� ���a�� hdlist> �� --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "�� ���� �� a������� ����j \"%s\"\n"
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"������� ������ �� ������ �������� �� �� ����� ����� �� ���� ���������:\n"
 "%s\n"
-"�������j� <��������� ���a�� hdlist>\n"
+"�� �� �� ������� ?"
+
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr "�����������"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "���� ��������� �� %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "���� �� ��������� %s"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "���� �� ����������� %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "�� �� ���������� %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"���� �������� ������ �� �� ���� �����������:\n"
 "%s\n"
-"`with' �������je �� ftp ����j\n"
+"�� �� �� ������� ?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "�� ���� �� ������� ����j \"%s\"\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "�������� �����, �������� ������\n"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"�������a: urpmi.removemedia [-a] <��e> ...\n"
-"��� je <��e> ��� ������ �� ���a�a�e.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "��� ������? (1-%d) "
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - ��������� ��� ������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "��������(�) �� ������� �����(�):"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"��������� ������ '%s'\n"
+msgid "One of the following packages is needed to install %s:"
+msgstr "����� �� �������� ������ �� �������� �� �� ����������� %s:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "���� ������ �a ����a�e (������� urpmi.addmedia �� �����a�� ����ja)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "���� ������������� ���� �� ��������� ������"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"�������j� ���� �� ����a�e\n"
-"(j���� �� %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "�������� ���� �������� �� %s\n"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"��������: urpmi.update [������] <���> ...\n"
-"��� <���> ����� ��� ������ �� ���������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "�� ���� �� �������� ������������ [%s] �� �������� � ������"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - �������� ���� ������� �� ���������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"��� �� ���� ������� �� �������� rpm �������� ���� �� ������� ������ --"
+"install-src"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - ��������� ��� �� ��������� ������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - ��������� �� ��������� ������������� depslist.ordered "
-"�����.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "���� proxy����������� � ��������� ������\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "���� ������ �a a�����a�e (������� urpmi.addmedia �� �����a�� ����ja)\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  ����� ��� rpm ������� ���� � ��������� ������ �� ���� �����������.\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"�������j� ���� �� a�����a��\n"
-"(j���� �� %s)\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - verbose �����.\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"
-msgstr ""
-"urpmi ������� %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� \n"
-"GNU � GPL. ��������:\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - ���� ����� (���� ������).\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --synthesis    - ������� ���� synthesis ������ urpmi-���� ���� ��������.\n"
-
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - ���������� ����� ������ �� �� �� �������� ������.\n"
+"  -s             - ������� ����� �� ������� ����� (���� ��� �  --src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - �������� fuzzy �������� (���� ��� -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - �������� fuzzy �������� (��� �  --fuzzy).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - ������� ����� �� ������� ����� (���� ��� �  -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - �� ���������� �������� ���� �������� ������.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - ��������� ���� ������ �� �������� �����.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p            - ��������� ������������ �� ������� ���� �������� ������.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean      - ������ rpm �� ���� ��� ���� ���� ������.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - ���� ��� ��������� � ��������� ������.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - ���� rpm ���� ���� ��������� � ����.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - ��������� ������ ���������� �������.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force        - ��������� �� ���������� ��� � ��� ���� ������ �� "
-"�������.\n"
+"  --verify-rpm   - ���������� rpm ������� ��� �����������.\n"
+"                   (--no-verify-rpm �� ����������, ���������� �� "
+"������������).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - ��������� ���� �� ��������� �� �� �� ��������� ������ "
-"���\n"
-"                   ������� �������������� ������.\n"
+"  --best-output  - ���� ������� ��������� ������ ��������:\n"
+"                   X ��� ���������� ���.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - ������� X ���������.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --allow-force  - ���������� ���� ��������� �� �� ���� �� ��������� ������ "
-"���\n"
-"                   ������� �������������� � �����������.\n"
+"  --env          - ������� ���������� �������� (������� �������� � ������).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1148,451 +1286,480 @@ msgstr ""
 "  --bug          - ����� �������� � ������ � ������������� ����������� "
 "���                      ������� ��������.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --env          - ������� ���������� �������� (������� �������� � ������).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - ������� X ���������.\n"
+"  --proxy-user   - �������� ��������� � ������� ���� �� ������� �� proxy\n"
+"                   ��������������� (������ �� <user:password>).\n"
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --best-output  - ���� ������� ��������� ������ ��������:\n"
-"                   X ��� ���������� ���.\n"
+"  --proxy        - ������� ������������� HTTP proxy, ���� ����� �� "
+"������������\n"
+"                   �� �� 1080 �� default-� (������ �� <proxyhost[:port]>).\n"
 
-#: ../urpmi_.c:103
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
-msgstr ""
-"  --verify-rpm   - ���������� rpm ������� ��� �����������.\n"
-"                   (--no-verify-rpm �� ����������, ���������� �� "
-"������������).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - �������� ������ download-�.\n"
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - ��������� ������ ���������� �������.\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 �� ��������� �������� �������.\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - ���� ��� ��������� � ��������� ������.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - ������� wget �� ��������� �������� �������.\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -p            - ��������� ������������ �� ������� ���� �������� ������.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - �� ���������� �������� ���� �������� ������.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - �������� fuzzy �������� (��� �  --fuzzy).\n"
+"  --allow-force  - ���������� ���� ��������� �� �� ���� �� ��������� ������ "
+"���\n"
+"                   ������� �������������� � �����������.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -s             - ������� ����� �� ������� ����� (���� ��� �  --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - ���� ����� (���� ������).\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - verbose �����.\n"
-
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  ����� ��� rpm ������� ���� � ��������� ������ �� ���� �����������.\n"
+"  --allow-nodeps - ��������� ���� �� ��������� �� �� �� ��������� ������ "
+"���\n"
+"                   ������� �������������� ������.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"��� �� ���� ������� �� �������� rpm �������� ���� �� ������� ������ --"
-"install-src"
+"  --force        - ��������� �� ���������� ��� � ��� ���� ������ �� "
+"�������.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "�� ���� �� �������� ������������ [%s] �� �������� � ������"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - ���� rpm ���� ���� ��������� � ����.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "�������� ���� �������� �� %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "���� ������������� ���� �� ��������� ������"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean      - ������ rpm �� ���� ��� ���� ���� ������.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "����� �� �������� ������ �� �������� �� �� ����������� %s:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "��������(�) �� ������� �����(�):"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - ��������� ���� ������ �� �������� �����.\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "��� ������? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - ������� ����� �� ������� ����� (���� ��� �  -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "�������� �����, �������� ������\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - �������� fuzzy �������� (���� ��� -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 ""
-"���� �������� ������ �� �� ���� �����������:\n"
-"%s\n"
-"�� �� �� ������� ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - ���������� ����� ������ �� �� �� �������� ������.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "�� �� ���������� %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - ������� ���� synthesis ������ urpmi-���� ���� ��������.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "���� �� ����������� %s"
+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 ������� %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� \n"
+"GNU � GPL. ��������:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "���� �� ��������� %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "�� ���� �� a������� ����j \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "���� ��������� �� %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "�����������"
+msgid "unable to create medium \"%s\"\n"
+msgstr "�� ���� �� ������� ����j \"%s\"\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 ""
-"������� ������ �� ������ �������� �� �� ����� ����� �� ���� ���������:\n"
 "%s\n"
-"�� �� �� ������� ?"
+"`with' �������je �� ftp ����j\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 "���� ���������� ����������, ������� ������ �� ���� ����������� (%d MB)"
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
+"%s\n"
+"�������j� <��������� ���a�� hdlist>\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 ""
-"������ �� ����� root ��������� �� �� ����������� ������� ������:\n"
 "%s\n"
+"�������j� <��������� ���a�� hdlist> �� --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "����� ������ ��j� ��������, �������..."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "�������� rpm ���� [%s] ..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% �� %s ��������, ETA = %s, ������ = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "�� ���� �� ����� ���������� cooker ������������\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% ��������, ������ = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"��������� ������ '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "������� ����j �� ������ %s � ������ [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "���������� enter ���� ������ �������..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "������� ������ ����� ���������� �������"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - ��������� �� ���������� hdlist �������.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "�� �� ������ �� ��������� ������������� ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - �������� �� ������� � ��������� synthesis ��� "
+"hdlist                      ����.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (�/�) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - ����� ������������ �� ����� ���������.\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 ""
-"����������� ��������, ��������� ���� �������.\n"
-"%s\n"
-"����� ������ �� ��������� ���� urpmi ���� ��������."
+"  --arch       - ������� ���� �����������, �������������� �� �����������\n"
+"                    ������������ Mandrake ������.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "���������j� ���� ������"
+#: ../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      - ������� ���� ������� ������������, default �� �����\n"
+"                   �� ������� ������������ ���� �� �������� �\n"
+"                   �������������� mandrake-release ������.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "������������ %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --form        - ������� ���� url ������ �� ���� ������, ������������� ��\n"
+"                    %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "������������ ��� ������� ���������� (�a/�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  - ���������� ������� ������� �� XXX-�� ���\n"
+"                     �������������, XXX ���� �� ���� ������, �������\n"
+"                     ���������� ��� ���� ��� ����� ��� ���� �� �� "
+"������ ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "�������� ����������� (--force)? (�a/�e) ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - ���������� ������� ��� ������ �� �������������\n"
+"                    ������.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "��� �� ��� �����������"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - ������ update �����.\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 ������� %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"��� �� ��������� ������� � ���� ���� �������������� ��� �������� GNU GPL.\n"
+"�������a: urpmi.addmedia [������] <���> <url> [with <����������_������>]\n"
+"��� je <url> j���� ��\n"
+"       file://<���a�a>\n"
+"       ftp://<login>:<������a>@<host>/<���a�a> with <��������� ��� �������e "
+"�ahdlist>\n"
+"       ftp://<host>/<���a�a> with <��������� ��� �������� �a hdlist>\n"
+"       http://<host>/<���a�a> with <��������� ��� �������� �a hdlist>\n"
 "\n"
-"��������:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - ��������� ����� ������.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media         - ��������� ����� ������.\n"
+"       removable://<���a�a>\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         - ��������� ����� ������� ��� ��������� ������ --"
-"parallel.\n"
+"�������j� ���� �� ����a�e\n"
+"(j���� �� %s)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases         - ��������� ����� ���������� �������.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "���� ������ �a ����a�e (������� urpmi.addmedia �� �����a�� ����ja)\n"
+
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - ��������� ��� ������.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - ����������� ������ �� ������ ��������� �� urpmi db ��\n"
-"                   stdout (���� root).\n"
+"�������a: urpmi.removemedia [-a] <��e> ...\n"
+"��� je <��e> ��� ������ �� ���a�a�e.\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      - ��������� ��� ������� ������ ��� download-� (���� root).\n"
+"�������j� ���� �� a�����a��\n"
+"(j���� �� %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - ��������� �������� �� ��������� ������.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "���� ������ �a a�����a�e (������� urpmi.addmedia �� �����a�� ����ja)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - ������ ������ ������� �� ������ ������� ��� �����������.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c              - ������ ����� �� ������� ���� ����� �� �� ������.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - �������� ������ �� ���� ��� ������� �����.\n"
+"  -d             - ��������� �� ��������� ������������� depslist.ordered "
+"�����.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - ��������� ����� ���������� � ���.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - ��������� ��� �� ��������� ������.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - ��������� ������� ���������� � ���.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - �������� ���� ������� �� ���������.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  ����� ��� rpm ������� ���� �� ���� � ��������� ������ �� �����������.\n"
+"��������: urpmi.update [������] <���> ...\n"
+"��� <���> ����� ��� ������ �� ���������.\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --list-nodes �� ���� ��������� ���� �� ������� --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf �����j� %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: �� ���� �� �������� rpm �������� \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright  (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� "
-"GNU � GPL."
+"  ����� ��� rpm ������� ���� �� ���� � ��������� ������ �� �����������.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "�������a: urpmf [������] <����>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - ��������� ������� ���������� � ���.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - �� ��������� ��� ���� (���������� ������ ������� ���� "
-"��� ��� � �������"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - ��������� ����� ���������� � ���.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    ������, �������������� �� ������������� �����)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - �������� ������ �� ���� ��� ������� �����.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - ��������� ��� ������."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c              - ������ ����� �� ������� ���� ����� �� �� ������.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - ��������� ��� ����: rpm ��� �������� (�������������� "
-"������� ���� ����"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    �������� ������ ��� ��� ����� ������)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - ��������� ��� �����: �����."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - ��������� ��� ��������: ��������."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - ��������� �������� ���: ��������."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - ��������� ��� �������: �������."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - ��������� ��� �����: ����."
-
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - ��������� ��� ������: ��� ������ (����� ������)."
-
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - ��������� ��� �������: ��� ������� (����� ������)."
+"  -u             - ������ ������ ������� �� ������ ������� ��� �����������.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - ��������� ��� ����: ��� ������� (� ���� ����)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - ��������� �������� �� ��������� ������.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - ��������� ��� ����������: ��� ��������� (� ���� ����)."
+"  --sources      - ��������� ��� ������� ������ ��� download-� (���� root).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr "  --obsoletes     - ��������� ��� �����: ��� ������� (� ���� ����)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - ����������� ������ �� ������ ��������� �� urpmi db ��\n"
+"                   stdout (���� root).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases         - ��������� ����� ���������� �������.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --prereqs         - ��������� ��� �������: ��� ������� (� ���� ����)."
+"  --list-nodes         - ��������� ����� ������� ��� ��������� ������ --"
+"parallel.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "�������� �� urpmf --help �� �� ��� ������ ������ �������� ������"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media         - ��������� ����� ������.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "����� ����� ���� ����� ������"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - ��������� ����� ������.\n"
+
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq ������� %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"��� �� ��������� ������� � ���� ���� �������������� ��� �������� GNU GPL.\n"
+"\n"
+"��������:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl ���� �����: ������ �� %d ��� ��������  %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "����������� �������� �� ���� %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "��������� rsync\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp ���� �����, ����� �� ��� ���������"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync ���� �����: ������ �� %d ��� ������ %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput ���� �����, ����� �� ��� ����������"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "��������� ssh\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "�� ���� %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "��������� ������ � ��������������� ����� � ���� %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp ���� ����� �� ����� %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "����� \"%s\" �������� �� ������� hdlist ���� �� ��� ���������, ����� �� "
-#~ "���� ���������"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "���� %s ���� �������� ������� urpmi"
 
 #~ msgid "Remove them all?"
 #~ msgstr "�� �� ������� ���?"
@@ -1616,12 +1783,6 @@ msgstr "����� ����� ���� ����� ������"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - ��������� ��� ������ � ������.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: �� ���� �� �������� rpm �������� \"%s\"\n"
-
 #~ msgid "avoid selecting %s as its locales language is not already selected"
 #~ msgstr "��������� ����������� %s ����� ��� ������� ����� ���� �������"
 
@@ -1700,9 +1861,6 @@ msgstr "����� ����� ���� ����� ������"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "���� proxy����������� � ��������� ������\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr ""
 #~ "usage: urpmi.addmedia [������] <���> <url> [��h <����������_�������>]"
diff --git a/po/sq.po b/po/sq.po
index b4cd722b..efff9ce7 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,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: 2002-12-04 23:55+0200\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -14,1156 +14,1286 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "instalim i %s\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 "Yy"
+
+#. 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 "Nn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf versioni %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Drejt� e Autorit (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 ""
-"Instalim automatik� i pakove...\n"
-"Ju keni k�rkuar instalimin e pakove %s\n"
+"Ky �sht� software gratis dhe mund t� shp�rndahet nd�r termet e GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "�sht� kjo n� rregull?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "p�rdorim: urpmf [options] <skedare>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - mos �faq� emrat e etiketave (marr�veshje n�se asnj� "
+"etiket� s'�sht� dh�n�"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Anulo"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    n� linj�n komanduese me mod� nd�raktiv"
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - �faqi t� gjitha etiketat."
 
-#: ../_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 "Yy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - �faqe etiket�n name: rpm skedarja (me marr�veshje n�se "
+"asnj� etiket� nuk �sht� dh�n�"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (P/j) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    n� linj�n komanduese mir�poo pa emr�r t� pakos)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - �faqe etiket�n group: grupi."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - �faqe etiket�n size: madh�sia."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - �faqe etiket�n serial: seri:"
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --sumary        - �faqe etiket�n summary: p�rmbledhje."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - �faqe etiket�n description: p�rshkrim."
 
-#: ../_irpm_.c:63
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - �faqi etiket� provides: t� gjitha pajisjet (linja t� "
+"shum�fishta)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - �faqe etiket�n requires: t� gjitha d�shirat� (linja t� "
+"shum�fishta)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr ""
+"  --files         - �faqr etiket�n files: t� gjitha skedaret (linja t� "
+"shum�fishta)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - �faqr etiket�n conflicts: t� gjitha konfliktet (linja t� "
+"shum�fishta)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - �faqr etiketn obsoletes: t� gjitha absolutisht (linja t� "
+"shum�fishta)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - �faqe etiket�n prereqs: t� gjitha parapraket (linja t� "
+"shum�fishta)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "tento urpmf --help p�r me shum� variante"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "asnj� liste e gjetur komplete p�r burimin"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: munges� e k�tij urdh�ri\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Program i pa njoftur p�r riatdhezimin t� faqeve web `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (P/j) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protokol i pa njoftur p�r p�rcaktimit e %s"
+msgid "Cancel"
+msgstr "Anulo"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "asnj� program riatdhezimin e faqeve web (curl apo wget) i gjetur\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "i pa mundur p�rdorimi i protokolit: %s"
+msgid "Is this OK?"
+msgstr "�sht� kjo n� rregull?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kopjimi d�shtoj: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Instalim automatik� i pakove...\n"
+"Ju keni k�rkuar instalimin e pakove %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget nuk �sht� i instaluar\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "instalim i %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget d�shtoj: dalje me kodin %d apo me sinjalin %d\n"
+msgid "unable to open rpmdb"
+msgstr "e pa mundur hapja e rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl nuk �sht� i instaluar\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "hyrja e pa mundur n� skedaren rpm [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"burim n� \"%s\" p�rpjekje p�r p�rdorimin e list�s n� p�rdorim, burimi i "
-"injoruar"
+msgid "%s conflicts with %s"
+msgstr "%s �sht� n� konflikt me %s"
 
-#: ../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 ""
-"e pa mundur kujdesja e burimit \"%s\" lista e skedares �sht� n� p�rdorim nga "
-"nj� burim tjet�r"
+msgid "%s is needed by %s"
+msgstr "%s nevojitet nga %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"i pa mundur p�rdorimi i emrit \"%s\" p�r burimin t� pa emruar sepse ky em�r "
-"�sht� n� p�rdorim e sip�r"
+msgid "unable to install package %s"
+msgstr "i pa mundur instalimi i pakos %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"e pa mundur marrja n� p�rsip�r e llogaris� \"%s\" sepse asnj� skedare e "
-"list� [%s] nuk ekziston"
+msgid "unable to remove package %s"
+msgstr "e pa mundur zhdukja e pakos %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "i pa mundur caktimi i burimit t� k�saj skedareje hdlist [%s]"
+msgid "Preparing..."
+msgstr "P�rgatitje..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "e pa mundur hyrja n� skedaren hdlist s� \"%s\", burim i injoruar"
+msgid "...retrieving failed: %s"
+msgstr "...rikuperim i d�shtuar: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "e pa mundur hyrja n� skedaren e listes s� \"%s\", burim i injoruar"
+msgid "...retrieving done"
+msgstr "...rikuperim i b�r�"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "tentim i pasimit t� burimit ekzistues \"%s\", nd�rprerje"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "rikuperim i skedareve rpm nga burimi\"%s\"..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "e pa mundur gjetja e skedar�s hdlist t� \"%s\", burim i injoruar"
+msgid "malformed input: [%s]"
+msgstr "hyrje e �formuar�: [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "e pa mundur gjetja e skedarn e listes s� \"%s\", burim i injoruar"
+msgid "unable to access medium \"%s\""
+msgstr "hyrje e pa mundur n� burimin \"%s\""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "skedare e list�s s� ngat�rruar p�r \"%s\", burim i injoruar"
+msgid "urpmi database locked"
+msgstr "baza e t� dh�nave urpmi e mbyllur"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "i pa mundur konsultimi i skedares-list \"%s\", burim i injoruar"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"burim i ngat�rruar \"%s\" �sht� i sh�nuar si leviz�, n� t� v�rtet nuk �sht�"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "shum� pika montuese p�r burimin t�rheq�s \"%s\""
+msgid "medium \"%s\" is not selected"
+msgstr "burimi \"%s\" nuk �sht� i zgjedhur"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "marrje e mjetit t�rheq�s si \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nuk mund t� lexohet skedarja [%s] nga burimi \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "p�rdorim i ndrysh�m i mjeteve t�rheq�se [%s] p�r \"%s\""
+msgid "package %s is not found."
+msgstr "pakoja %s nuk �sht� prezente"
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "e pa mundur hyrja n� shtegun e burimit t�rheq�s \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
+"burimi \"%s\" nuk ka kurr�far difinicioni p�r lokalizimin e skedareve rpm "
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "i pa mundur shkrimi i skedares s� konfigurimit [%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:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "shkruaja e skedares s� konfigurimit [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ka pako t� shumta me em�r t� nj�jt� skedareje n� rpm \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "analizimi i pa mundur i \"%s\" n� skedaren [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "analizim korrekt i pa mundur [%s] n� vler�n \"%s\""
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "kontrollim i p�rkrahjes shp�rndar�se n� skedaren [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Pakot e radhitura p�rmbajn� %s: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "gjetja p�rkrahjes s� shp�rndarjes n� nyjet: %s"
+msgid "no package named %s"
+msgstr "asnj� pako e emruar %s"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "p�rdorim i burimit t� lidhur p�r mod� paralel : %s"
+msgid "error registering local packages"
+msgstr "gabim gjat� regjistrimit t� pakove lokale"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "hyrja e pa mundur n� skedaren rpm [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "i pa mundur p�rdorimi i mund�sis� shp�rndar�se \"%s\""
+msgid "retrieving rpm file [%s] ..."
+msgstr "rikuperim i skedareve rpm [%s]..."
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis nuk mund t� p�rdoret me --media, update ose --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "emri i skedares rpm �sht� invalid [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr "asnj� hyrje e zhvendosur n� depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "hyrjet %s zhvendosen n� depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "demontim n� %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "montim i %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "zhdukje e majave %d absolute n� fshehje"
 
-#: ../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 "found %d headers in cache"
+msgstr "gjetja e maj�s %d n� fshehje"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "krijim i skedares sintez� p�r burimin \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "kontrollim i skedares hdlist [%s]"
 
-#: ../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]"
 msgstr "kontrollim i skedares sintez� [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problem gjat� leximit t� skedares hdlist n� burimin \"%s\""
+msgid "building hdlist [%s]"
+msgstr "krijim i hdlist [%s]"
 
-#: ../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 "reading headers from medium \"%s\""
+msgstr "lexim i maj�s nga burimi \"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "ekzekutim i dyt� p�r ti mbledhur mvarjet\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "prblem gjat� leximit t� skedares sitez� t� burimit \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "e pa mundur hapja e rpmdb"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "burimi \"%s\" ekziston me heret"
+msgid "nothing written in list file for \"%s\""
+msgstr "asgj� s'�sht� shruar n� skedaren list \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "shtim i burimit %s"
+msgid "writing list file for medium \"%s\""
+msgstr "shkruarja e skedares p�r list�n e burimit \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "hyrja e pa mundur n� burimin e par� instalues"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "shkruarja n� skedaren list �sht� e pa mundur p�r \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "kopjim i skedares hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "skedarja [%s] �sht� n� p�rdorim n� t� nj�jtin burim \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kopjimi i b�r�"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "analizimi i hdlist �sht� i pa mundur t� \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kopjimi i b�r�"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "asnj� skedare e gjetur hdlist p�r burimin \"%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)"
-msgstr ""
-"hyrja e pa mundur n� burimin e par� instalues (asnj� skedare e gjetur n� "
-"Mandrake/base/hdlists)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "rikuperimi i burimit hdlist (ose sintez�s) d�shtoj"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "rikuperim i skedares hdlist..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "kontrollim i skedares"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...rikuperim i b�r�"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "kopjim i burimit hdlist (ose sintez�s) t� \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...rikuperim i d�shtuar: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "rikuperim i burimit hdlist (ose sintez�s) t� \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "p�rshkrimi \"%s\"  i pa pranuesh�m p�r skedaret hdlists"
+msgid "retrieving description file of \"%s\"..."
+msgstr "rikuperim i skedares p�rshkruese t� \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "tento p�r zgjedhjen e nj� burimi jo ekzistues \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "asnj� skedare rpm e gjetur nga [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "leximi i skedares rpm �sht� i pa mundur nga [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "zgjedhje t� shumta burimesh: %s"
+msgid "reading rpm files from [%s]"
+msgstr "lexim i skedareve rpm nga [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "zhdukje e burimit \"%s\""
+msgid "...copying done"
+msgstr "...kopjimi i b�r�"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "baza e t� dh�nave urpmi e mbyllur"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...kopjimi i b�r�"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "hyrje e pa mundur n� burimin \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "kopjim i list�s s� burimit t� \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopjim i skedares p�rshkruese t� \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "kopjim i [%s] d�shtoj"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopjim i burimit hdlist (ose sintez�s) t� \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "kopjim i [%s] d�shtoj"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "kontrollim i skedares"
+msgid "copying description file of \"%s\"..."
+msgstr "kopjim i skedares p�rshkruese t� \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopjim i list�s s� burimit t� \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "zhdukje e burimit \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "lexim i skedareve rpm nga [%s]"
+msgid "selecting multiple media: %s"
+msgstr "zgjedhje t� shumta burimesh: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "leximi i skedares rpm �sht� i pa mundur nga [%s]: %s"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "asnj� skedare rpm e gjetur nga [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "tento p�r zgjedhjen e nj� burimi jo ekzistues \"%s\""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "rikuperim i skedares p�rshkruese t� \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"hyrja e pa mundur n� burimin e par� instalues (asnj� skedare e gjetur n� "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "rikuperim i burimit hdlist (ose sintez�s) t� \"%s\"..."
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "rikuperimi i burimit hdlist (ose sintez�s) d�shtoj"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "p�rshkrimi \"%s\"  i pa pranuesh�m p�r skedaret hdlists"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "asnj� skedare e gjetur hdlist p�r burimin \"%s\""
+msgid "retrieving hdlists file..."
+msgstr "rikuperim i skedares hdlist..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "skedarja [%s] �sht� n� p�rdorim n� t� nj�jtin burim \"%s\""
+msgid "copying hdlists file..."
+msgstr "kopjim i skedares hdlist..."
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "analizimi i hdlist �sht� i pa mundur t� \"%s\""
+msgid "unable to access first installation medium"
+msgstr "hyrja e pa mundur n� burimin e par� instalues"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "shkruarja n� skedaren list �sht� e pa mundur p�r \"%s\""
+msgid "added medium %s"
+msgstr "shtim i burimit %s"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "shkruarja e skedares p�r list�n e burimit \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "burimi \"%s\" ekziston me heret"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "asgj� s'�sht� shruar n� skedaren list \"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problem gjat� leximit t� skedares hdlist n� burimin \"%s\""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "ekzekutim i dyt� p�r ti mbledhur mvarjet\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis nuk mund t� p�rdoret me --media, update ose --parallel"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "lexim i maj�s nga burimi \"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "i pa mundur p�rdorimi i mund�sis� shp�rndar�se \"%s\""
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "krijim i hdlist [%s]"
+msgid "using associated media for parallel mode: %s"
+msgstr "p�rdorim i burimit t� lidhur p�r mod� paralel : %s"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "krijim i skedares sintez� p�r burimin \"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr "gjetja p�rkrahjes s� shp�rndarjes n� nyjet: %s"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "gjetja e maj�s %d n� fshehje"
+msgid "examining parallel handler in file [%s]"
+msgstr "kontrollim i p�rkrahjes shp�rndar�se n� skedaren [%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "zhdukje e majave %d absolute n� fshehje"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "analizimi i pa mundur i \"%s\" n� skedaren [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "montim i %s"
+msgid "write config file [%s]"
+msgstr "shkruaja e skedares s� konfigurimit [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "demontim n� %s"
+msgid "unable to write config file [%s]"
+msgstr "i pa mundur shkrimi i skedares s� konfigurimit [%s]"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "hyrjet %s zhvendosen n� depslist"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "e pa mundur hyrja n� shtegun e burimit t�rheq�s \"%s\""
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "asnj� hyrje e zhvendosur n� depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "p�rdorim i ndrysh�m i mjeteve t�rheq�se [%s] p�r \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "emri i skedares rpm �sht� invalid [%s]"
+msgid "taking removable device as \"%s\""
+msgstr "marrje e mjetit t�rheq�s si \"%s\""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "rikuperim i skedareve rpm [%s]..."
+msgid "too many mount points for removable medium \"%s\""
+msgstr "shum� pika montuese p�r burimin t�rheq�s \"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "hyrja e pa mundur n� skedaren rpm [%s]"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "i pa mundur konsultimi i skedares-list \"%s\", burim i injoruar"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "hyrja e pa mundur n� skedaren rpm [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "skedare e list�s s� ngat�rruar p�r \"%s\", burim i injoruar"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "gabim gjat� regjistrimit t� pakove lokale"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "e pa mundur gjetja e skedarn e listes s� \"%s\", burim i injoruar"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "asnj� pako e emruar %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "e pa mundur gjetja e skedar�s hdlist t� \"%s\", burim i injoruar"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Pakot e radhitura p�rmbajn� %s: %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "tentim i pasimit t� burimit ekzistues \"%s\", nd�rprerje"
 
-#: ../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\""
-msgstr "ka pako t� shumta me em�r t� nj�jt� skedareje n� rpm \"%s\""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "e pa mundur hyrja n� skedaren e listes s� \"%s\", burim i injoruar"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "analizim korrekt i pa mundur [%s] n� vler�n \"%s\""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "e pa mundur hyrja n� skedaren hdlist s� \"%s\", burim i injoruar"
 
-#: ../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)"
-msgstr ""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "i pa mundur caktimi i burimit t� k�saj skedareje hdlist [%s]"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
-"burimi \"%s\" nuk ka kurr�far difinicioni p�r lokalizimin e skedareve rpm "
+"e pa mundur marrja n� p�rsip�r e llogaris� \"%s\" sepse asnj� skedare e "
+"list� [%s] nuk ekziston"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "pakoja %s nuk �sht� prezente"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"i pa mundur p�rdorimi i emrit \"%s\" p�r burimin t� pa emruar sepse ky em�r "
+"�sht� n� p�rdorim e sip�r"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "burimi \"%s\" nuk �sht� i zgjedhur"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"e pa mundur kujdesja e burimit \"%s\" lista e skedares �sht� n� p�rdorim nga "
+"nj� burim tjet�r"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nuk mund t� lexohet skedarja [%s] nga burimi \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"burim n� \"%s\" p�rpjekje p�r p�rdorimin e list�s n� p�rdorim, burimi i "
+"injoruar"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"burim i ngat�rruar \"%s\" �sht� i sh�nuar si leviz�, n� t� v�rtet nuk �sht�"
+"burim n� \"%s\" p�rpjekje p�r p�rdorimin e hdlist n� p�rdorim, burimi i "
+"injoruar"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "hyrje e �formuar�: [%s]"
+msgid "syntax error in config file at line %s"
+msgstr "gabim i sintaks�s n� skedaren e konfigurimit n� rreshtin%s"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "rikuperim i skedareve rpm nga burimi\"%s\"..."
-
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "P�rgatitje..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% kompletuar, shpejt�si = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "e pa mundur zhdukja e pakos %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% nga %s kompletuar, ETA = %s, shpejt�si = %s"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "i pa mundur instalimi i pakos %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync d�shtoj: dalje me kodin %d apo me sinjalin %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s nevojitet nga %s"
+msgid "ssh is missing\n"
+msgstr "ssh mungon\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �sht� n� konflikt me %s"
+msgid "rsync is missing\n"
+msgstr "rsync mungon\n"
 
-#: ../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 d�shtoj, ndoshta nj� nyje �sht� e pa-arritur"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl  d�shtoj: dalje me kodin %d apo me sinjalin %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 d�shtoj, ndoshta nj� nyje �sht� e pa-arritur"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl nuk �sht� i instaluar\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "n� mod� %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget d�shtoj: dalje me kodin %d apo me sinjalin %d\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 "Instalimi d�shtoj n� nyj�n %s"
+msgid "wget is missing\n"
+msgstr "wget nuk �sht� i instaluar\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 "Instalimi �sht� i mundur"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "kopjimi d�shtoj: %s"
 
-#: ../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 d�shtoj n� ftuesin %s"
+msgid "unable to handle protocol: %s"
+msgstr "i pa mundur p�rdorimi i protokolit: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "makina %s nuk e ka nj� version t� mir� t� urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "asnj� program riatdhezimin e faqeve web (curl apo wget) i gjetur\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 ""
-"urmpe versioni %s\n"
-"Drejt� e autorit (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ky �sht� software gratis dhe mund t� rishp�rndahet nd�r termet e GNU GPL.\n"
-"\n"
-"p�rdorim:\n"
+msgid "unknown protocol defined for %s"
+msgstr "protokol i pa njoftur p�r p�rcaktimit e %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         - shtype k�t� lajm� ndihmues.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Program i pa njoftur p�r riatdhezimin t� faqeve web `%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - zgjedhni automatikisht nj� nd�r pakot p�r zgjedhje.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Zhdukja d�shtoj"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test        - verifiko n�se instalimi mbaron n� m�nyr� korrekte.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "P�r ta plot�suar mvar�sin, pakot� me radh� do t� zhduken (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
-"  --parallel     - urmpi �sht� shp�rndar� n� pseudo makina t� shum�ta.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Verifikimi i zhdukjes s� pakove t� radhitura"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - zgjedhni t� gjitha pakot me p�rshkrim t� nj�jt�.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Mos zhduk asgj�"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: mund�si e pa njoftur \"-%s\", verifiko p�rdorimin me --help\n"
+msgid "removing package %s will break your system"
+msgstr "zhdukja a pakove %s do t� d�mtoj sistemin tuaj"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "pako e pa njoftur"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "pako t� pa njoftura"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "zhdukja a pakove %s do t� d�mtoj sistemin tuaj"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: mund�si e pa njoftur \"-%s\", verifiko p�rdorimin me --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Mos zhduk asgj�"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - zgjedhni t� gjitha pakot me p�rshkrim t� nj�jt�.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Verifikimi i zhdukjes s� pakove t� radhitura"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr ""
+"  --parallel     - urmpi �sht� shp�rndar� n� pseudo makina t� shum�ta.\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 "P�r ta plot�suar mvar�sin, pakot� me radh� do t� zhduken (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test        - verifiko n�se instalimi mbaron n� m�nyr� korrekte.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Zhdukja d�shtoj"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - zgjedhni automatikisht nj� nd�r pakot p�r zgjedhje.\n"
 
-#: ../urpmf_.c:26
+#: ../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         - shtype k�t� lajm� ndihmues.\n"
+
+#: ../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 versioni %s\n"
-"Drejt� ae Autorit (C) 2002 MandrakeSoft.\n"
-"Ky �sht� software gratis i cili mund t� shp�rndahet nd�r termet e GNU dhe "
-"GPL.\n"
+"urmpe versioni %s\n"
+"Drejt� e autorit (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ky �sht� software gratis dhe mund t� rishp�rndahet nd�r termet e GNU GPL.\n"
 "\n"
-"p�rdorues:\n"
-
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - p�rdori vet�m burimet e azhurnimit.\n"
+"p�rdorim:\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
-"  --media        - p�rdori vet�m burimet e dh�na, t� ndara me presje.\n"
+"thirrja e mbrapme �sht� :\n"
+"%s\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"  --synthesis    - p�rdori skedaret e th�na sintez� n� vend t� baz�s s� t� "
-"dh�nave urpmi.\n"
+"  )             - kllap� e djatht� p�r ta mbyllur shprehjen e grupit.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - model oratori.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (             - kllap� e majt� p�r ta hapur shprehjen e grupit.\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"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
-"  --quiet        - mos �faq� emrat e etiketave (marr�veshje n�se asnj� "
-"etiket� s'�sht� dh�n�\n"
-"\t\t    n� linj�n komanduese, nuk p�rputhet me modin interaktiv).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - �faqi t� gjitha etiketat.\n"
+"  -!             - nj�jsi NOT, sakt�si n�se shprehja �sht� e pa v�rtet.\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"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --name          - �faqe etiket�n name: rpm skedarja (me marr�veshje n�se "
-"asnj� etiket�\n"
-"\t\t     s'�sht� dh�n� n� linj�n komanduese mir�po pa em�r t� pakos).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - �faqe etiket�n group: grupi.\n"
+"  -o             - operues OR binar, sakt�si n�se nj�ra nga shprehjet �sht� "
+"e sakt�.\n"
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - �faqe etiket�n size: madh�sia.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr ""
+"  -a             - operues AND binar, sakt�si n�se t� dy shprehjet jan� t� "
+"sakta.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch          - �faqe etiket�n epoch: epok�.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - p�rfshij kodin perl direkt sikur perl -e.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary        - �faqe etiket�n summary: p�rmbledhje.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - �faqe versionin, holl�sit� dhe arkitektures me em�r.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - �faqe etiket�n description: p�rshkrim.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - injoro rastet e ndryshme n� gjdo model.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - �faqi etiket� provides: t� gjitha pajisjet (linja t� "
+"  --obsoletes     - �faqr etiketn obsoletes: t� gjitha absolutisht (linja t� "
 "shum�fishta).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - �faqe etiket�n requires: t� gjitha d�shirat� (linja t� "
+"  --conflicts     - �faqr etiket�n conflicts: t� gjitha konfliktet (linja t� "
 "shum�fishta).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr ""
 "  --files         - �faqr etiket�n files: t� gjitha skedaret (linja t� "
 "shum�fishta).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - �faqr etiket�n conflicts: t� gjitha konfliktet (linja t� "
+"  --requires      - �faqe etiket�n requires: t� gjitha d�shirat� (linja t� "
 "shum�fishta).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - �faqr etiketn obsoletes: t� gjitha absolutisht (linja t� "
+"  --provides      - �faqi etiket� provides: t� gjitha pajisjet (linja t� "
 "shum�fishta).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - injoro rastet e ndryshme n� gjdo model.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - �faqe etiket�n description: p�rshkrim.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - �faqe versionin, holl�sit� dhe arkitektures me em�r.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary        - �faqe etiket�n summary: p�rmbledhje.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - p�rfshij kodin perl direkt sikur perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch          - �faqe etiket�n epoch: epok�.\n"
 
-#: ../urpmf_.c:54
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - operues AND binar, sakt�si n�se t� dy shprehjet jan� t� "
-"sakta.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - �faqe etiket�n size: madh�sia.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - �faqe etiket�n group: grupi.\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -o             - operues OR binar, sakt�si n�se nj�ra nga shprehjet �sht� "
-"e sakt�.\n"
+"  --name          - �faqe etiket�n name: rpm skedarja (me marr�veshje n�se "
+"asnj� etiket�\n"
+"\t\t     s'�sht� dh�n� n� linj�n komanduese mir�po pa em�r t� pakos).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - �faqi t� gjitha etiketat.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -!             - nj�jsi NOT, sakt�si n�se shprehja �sht� e pa v�rtet.\n"
+"  --quiet        - mos �faq� emrat e etiketave (marr�veshje n�se asnj� "
+"etiket� s'�sht� dh�n�\n"
+"\t\t    n� linj�n komanduese, nuk p�rputhet me modin interaktiv).\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (             - kllap� e majt� p�r ta hapur shprehjen e grupit.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - model oratori.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  )             - kllap� e djatht� p�r ta mbyllur shprehjen e grupit.\n"
+"  --synthesis    - p�rdori skedaret e th�na sintez� n� vend t� baz�s s� t� "
+"dh�nave urpmi.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"thirrja e mbrapme �sht� :\n"
-"%s\n"
+"  --media        - p�rdori vet�m burimet e dh�na, t� ndara me presje.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - p�rdori vet�m burimet e azhurnimit.\n"
+
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"p�rdorim: urmpi.addmedia [options] <emri> <url> [me <shteg relativ�>]\n"
-"ku <url> �sht� nj�ri nga\n"
-"       file://<shtegu>\n"
-"       ftp://<p�rdorues>:<parulla>@<ftues>/<shteg> me <em�r relativ� t� "
-"skedareshdlist>\n"
-"       ftp://<ftues>/<shtegu> me <em�r relativ� t� skedares hdlist>\n"
-"       http://<ftues>/<shtegu> me <em�r relativ� t� skedares hdlist>\n"
-"       removable://<shtegu>\n"
+"urpmf versioni %s\n"
+"Drejt� ae Autorit (C) 2002 MandrakeSoft.\n"
+"Ky �sht� software gratis i cili mund t� shp�rndahet nd�r termet e GNU dhe "
+"GPL.\n"
 "\n"
-"dhe [options] jan� nga\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         - p�rdore wget p�r rikuperimin e skedareve n� distanc�.\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         - p�dore curl p�r rikuperimin e skedareve n� distanc�.\n"
+"p�rdorues:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - kyfizim i shp�jt�sis� q� shkarkimit.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "gjdo gj� �sht� instaluar"
 
-#: ../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        - p�rdore proxy HTTP, numri i port�s �sht� supozuar\n"
-"                   t� jet� 1080 n� marr�veshje (forma �sht� <proxyhost[:port]"
-">).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalimi �sht� i mundur"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - specifiko p�rdor�sin dhe parull�n p�r p�rdorim t� proxy\n"
-"                   me v�rtetim (forma �sht� <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "D�shtim i instalimit"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - krijo nj� burim azhurnimi.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tento ta forcosh instalimin (--force)? (p/J) "
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - krijo automatikisht t� gjitha burimet nga "
-"nj�                    burim instalues.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tento instalimin pas verifikimin e mvar�sive? (p/J) "
 
-#: ../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  - krijo automatikisht nj� burim p�r pjes�n XXX n�\n"
-"                   shp�rndarjen, XXX e cila mund t� jet� "
-"krysore,                   kontribuese, azhrunuese apo �far� do �oft� q�\n"
-"                   �sht� konfiguruar ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "shp�rndaj� %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --from          - p�rdore url e specifikuar t� pasqyreve me marr�vshje\n"
-"                    �sht� %s\n"
+"D�shtim gjat� instalimit, disa skedare mungojn�:\n"
+"%s\n"
+"A d�shironi t� azhurnoni baz�n e t� dh�nave urpmi"
 
-#: ../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"
-msgstr ""
-"  --version      - p�rdore versionin e specifikuar, me marr�veshje "
-"t�                    pranuar� nga versioni shp�rndar�s i treguar nga\n"
-"                   versioni i pakove �instalues mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (p/J)"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - p�rdore arqitektur�n e specifikuar, me marr�veshje �sht�\n"
-"                   arqitektura e pakove instaluese mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "A d�shironi t� vazhdoni me instalimin e tyre ?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - pastrim i majave n� repertor� t� fsheht.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Pakot a radhitura kan� n�nshkrim t� pa pranuesh�m"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - tento ta gjesh� dhe p�rdore skedaren sintez�n apo\n"
-"                   hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Shtypni Enter kur jeni i gatsh�m..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forco p�rfitimin e skedareve hdlist.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ju lutemi futni burimin e emruar \"%s\" n� mjetin [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nuk mund t� shtoj azhurnimet n� shp�rndar�sin cooker\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "e pa mundur marrja e burimit t� pakos, d�shtim"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"specifikim i pa nevojsh�m <relativ� i hdlist> me --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "azhurnimi i burimit �sht� i pa mundur \"%s\"\n"
+"P�r ti p�rmbushur mvar�sit, pakot e radhitura duhet t� instalohen (%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Ju duhet t� jeni root q� t� instaloni pakot e radhitura:\n"
 "%s\n"
-"<shteg relativ� i hdlist> mungon\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 ""
+"Pakot a radhitura duhet t� zhduken q� t� tjerat t� ngriten n� poste:\n"
 "%s\n"
-"direktiv� `me' munges� p�r burimin ftp\n"
+"a pajtoheni me k�t� ?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "i pa mundur krijimi i burimit \"%s\"\n"
+msgid "unrequested"
+msgstr "i pa k�rkuar"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"p�rdorim:urmpi.removemedia [-a] <emri> ...\n"
-"ku <emri> �sht� nj� burim i nxjerrur.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "ka arritur gjat� konfliktit me %s"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - zgjidhi t� gjitha burimet.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "ka arritur nga mungesa %s"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"zgjedhje e pa njoftur '%s'\n"
+msgid "due to unsatisfied %s"
+msgstr "ka arritur gjat� mosmarr�vshjes %s"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "mos zhduk asgj� (p�rdore urpmi.addmedia p�r t� shtuar nj� burim)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "n� urdh�r p�r instlaim %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 ""
-"hyrja zhduk�se mungon\n"
-"(nj� nga %s)\n"
+"Disa nga pakot e k�rkuara nuk mund t� instalohen:\n"
+"%s\n"
+"a pajtoheni me k�t� ?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"p�rdorim:urmpi.update [option] <emri> ...\n"
-"ku <emri> �sht� nj� emrim i burimit p�r azhurnim.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Kemi ndjes�, zgjedhje e gabuar, provoni edhe nj� her�\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - azhurno vet�m burimet e azhurnuese.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Cila �sht� zgidhja e juaj? (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - zgjidhni t� gjitha burimet jo leviz�se.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Nj� nga pakot me radh� nevojitet:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d       - forco mbledhjen komplete t� skedares depslist.ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Nj� nga pakot me radh� duhet t� instalohet %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"asgj� p�r t� azhurnuar (p�rdore urpmi.addmedia p�r t� shtuar nj� burim)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Vet�m administratori i sistemin (root) ka mund�si t� instaloj� pakot"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"hyrja p�r azhurnim mungon\n"
-"(nj� nga %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "p�rdorim specifik i mjedisit n� %s\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 "I pa mundur krijimi i repertorit [%s] p�r raport t� bug(it)"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"urmpi versioni %s\n"
-"Drejt� e autorit (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ky �sht� software gratis dhe mund t� rishp�rndahet nd�r termet e GNU GPL.\n"
-"\n"
-"p�rdorim:\n"
+"�far� mund t� b�het me skedaret rpm binare n�se e p�rdorni --install-src"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - p�rdori skedaret e dh�na sintez� n� vend t� db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: variant e pa njoftur \"-%s\", verifiko p�rdorimin me --help\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - zgjedhni automatikisht pakot e azhurnimit.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - shfryt�zo hetimin e paqart� (nj�jt� si -y).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  emrat apo skedaret rpm n� linj�n komanduese do t� instalohen.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - pakoja me radh� �sht� pako e burimit (nj�jt� si -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - model oratori.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instalo vet�m burimet e pakove (jo binar).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - model i qet�.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --clean        - zhduki t� gjith� rpm e fshehta para gjdo operacioni.\n"
+"  -s             - pakoja tjet�r �sht� nj� pako burimi (nj�jt� si --src).\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - mbani rpm e pa p�rdorura n� fshehje.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impono k�rkimin e paqart� (nj�jt� si --fuzzy).\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - forco k�rkimin edhe pse disa pako nuk ekzistojn�.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - mos k�rko n� pajisje p�r t� gjetur pakon.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - lejon k�rkimet n� pajisje p�r ta gjetur pakon.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --allow-nodeps - mund�son q� p�rdoruesi n� pytje t� instaloj\n"
-"                   pakot pas i verifikuar mvar�sit e tyre.\n"
+"  -a             - zgjedhni t� gjitha korrespondencat n� linj�n komanduese.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - p�rdori vet�m burimet e ndara me presje.\n"
+
+#: ../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  - mund�son q� p�rdoruesi n� pytje t� instaloj\n"
-"                   pakot pas i verifikuar mvar�sit dhe integritetin e tyre.\n"
+"  --verify-rpm   - verifiko n�nshkrimin e rpm para instalimit\n"
+"                   (--no-verify-rpm dezaktivo verifikim e tyre).\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          - dor�zo nj� raport t� bug(it) n� repertorin "
-"e                   sugjeruar nga argumenti i dyt�.\n"
+"  --best-output  - zgjedheni sip�rfq�n m� t� mir� n� funksion t�\n"
+"                   mjedisit: X ose n� mod� tekst.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - p�rdore sip�rfaq�n ndar�se X.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1171,455 +1301,492 @@ msgstr ""
 "  --env          - p�rdore mjedisin e ve�ant� (ve��narisht� nj� raport\n"
 "                   bug(i).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - p�rdore sip�rfaq�n ndar�se X.\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  - zgjedheni sip�rfq�n m� t� mir� n� funksion t�\n"
-"                   mjedisit: X ose n� mod� tekst.\n"
+"  --bug          - dor�zo nj� raport t� bug(it) n� repertorin "
+"e                   sugjeruar nga argumenti i dyt�.\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   - verifiko n�nshkrimin e rpm para instalimit\n"
-"                   (--no-verify-rpm dezaktivo verifikim e tyre).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - p�rdori vet�m burimet e ndara me presje.\n"
+"  --proxy-user   - specifiko p�rdor�sin dhe parull�n p�r p�rdorim t� proxy\n"
+"                   me v�rtetim (forma �sht� <user:password>).\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\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 ""
-"  -a             - zgjedhni t� gjitha korrespondencat n� linj�n komanduese.\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - lejon k�rkimet n� pajisje p�r ta gjetur pakon.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - mos k�rko n� pajisje p�r t� gjetur pakon.\n"
+"  --proxy        - p�rdore proxy HTTP, numri i port�s �sht� supozuar\n"
+"                   t� jet� 1080 n� marr�veshje (forma �sht� <proxyhost[:port]"
+">).\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impono k�rkimin e paqart� (nj�jt� si --fuzzy).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - kyfizim i shp�jt�sis� q� shkarkimit.\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 "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"  -s             - pakoja tjet�r �sht� nj� pako burimi (nj�jt� si --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - model i qet�.\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - model oratori.\n"
-
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  emrat apo skedaret rpm n� linj�n komanduese do t� instalohen.\n"
+"  --curl         - p�dore curl p�r rikuperimin e skedareve n� distanc�.\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: variant e pa njoftur \"-%s\", verifiko p�rdorimin me --help\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget         - p�rdore wget p�r rikuperimin e skedareve n� distanc�.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"�far� mund t� b�het me skedaret rpm binare n�se e p�rdorni --install-src"
+"  --allow-force  - mund�son q� p�rdoruesi n� pytje t� instaloj\n"
+"                   pakot pas i verifikuar mvar�sit dhe integritetin e tyre.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "I pa mundur krijimi i repertorit [%s] p�r raport t� bug(it)"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - mund�son q� p�rdoruesi n� pytje t� instaloj\n"
+"                   pakot pas i verifikuar mvar�sit e tyre.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "p�rdorim specifik i mjedisit n� %s\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - forco k�rkimin edhe pse disa pako nuk ekzistojn�.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Vet�m administratori i sistemin (root) ka mund�si t� instaloj� pakot"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - mbani rpm e pa p�rdorura n� fshehje.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Nj� nga pakot me radh� duhet t� instalohet %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - zhduki t� gjith� rpm e fshehta para gjdo operacioni.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Nj� nga pakot me radh� nevojitet:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instalo vet�m burimet e pakove (jo binar).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Cila �sht� zgidhja e juaj? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - pakoja me radh� �sht� pako e burimit (nj�jt� si -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Kemi ndjes�, zgjedhje e gabuar, provoni edhe nj� her�\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - shfryt�zo hetimin e paqart� (nj�jt� si -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 ""
-"Disa nga pakot e k�rkuara nuk mund t� instalohen:\n"
-"%s\n"
-"a pajtoheni me k�t� ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - zgjedhni automatikisht pakot e azhurnimit.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "n� urdh�r p�r instlaim %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - p�rdori skedaret e dh�na sintez� n� vend t� db.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "ka arritur gjat� mosmarr�vshjes %s"
+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 ""
+"urmpi versioni %s\n"
+"Drejt� e autorit (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ky �sht� software gratis dhe mund t� rishp�rndahet nd�r termet e GNU GPL.\n"
+"\n"
+"p�rdorim:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "ka arritur nga mungesa %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "azhurnimi i burimit �sht� i pa mundur \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "ka arritur gjat� konfliktit me %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "i pa k�rkuar"
+msgid "unable to create medium \"%s\"\n"
+msgstr "i pa mundur krijimi i burimit \"%s\"\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 ""
-"Pakot a radhitura duhet t� zhduken q� t� tjerat t� ngriten n� poste:\n"
 "%s\n"
-"a pajtoheni me k�t� ?"
+"direktiv� `me' munges� p�r burimin ftp\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"P�r ti p�rmbushur mvar�sit, pakot e radhitura duhet t� instalohen (%d MB)"
+"%s\n"
+"<shteg relativ� i hdlist> mungon\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 ""
-"Ju duhet t� jeni root q� t� instaloni pakot e radhitura:\n"
 "%s\n"
+"specifikim i pa nevojsh�m <relativ� i hdlist> me --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "e pa mundur marrja e burimit t� pakos, d�shtim"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "rikuperim i skedareve rpm [%s]..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% nga %s kompletuar, ETA = %s, shpejt�si = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nuk mund t� shtoj azhurnimet n� shp�rndar�sin cooker\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% kompletuar, shpejt�si = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"zgjedhje e pa njoftur '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ju lutemi futni burimin e emruar \"%s\" n� mjetin [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Shtypni Enter kur jeni i gatsh�m..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Pakot a radhitura kan� n�nshkrim t� pa pranuesh�m"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forco p�rfitimin e skedareve hdlist.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "A d�shironi t� vazhdoni me instalimin e tyre ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - tento ta gjesh� dhe p�rdore skedaren sintez�n apo\n"
+"                   hdlist.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (p/J)"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - pastrim i majave n� repertor� t� fsheht.\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 ""
-"D�shtim gjat� instalimit, disa skedare mungojn�:\n"
-"%s\n"
-"A d�shironi t� azhurnoni baz�n e t� dh�nave urpmi"
+"  --arch         - p�rdore arqitektur�n e specifikuar, me marr�veshje �sht�\n"
+"                   arqitektura e pakove instaluese mandrake-release.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "D�shtim i instalimit"
+#: ../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      - p�rdore versionin e specifikuar, me marr�veshje "
+"t�                    pranuar� nga versioni shp�rndar�s i treguar nga\n"
+"                   versioni i pakove �instalues mandrake-release.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "shp�rndaj� %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from          - p�rdore url e specifikuar t� pasqyreve me marr�vshje\n"
+"                    �sht� %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tento instalimin pas verifikimin e mvar�sive? (p/J) "
+#: ../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  - krijo automatikisht nj� burim p�r pjes�n XXX n�\n"
+"                   shp�rndarjen, XXX e cila mund t� jet� "
+"krysore,                   kontribuese, azhrunuese apo �far� do �oft� q�\n"
+"                   �sht� konfiguruar ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tento ta forcosh instalimin (--force)? (p/J) "
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - krijo automatikisht t� gjitha burimet nga "
+"nj�                    burim instalues.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "gjdo gj� �sht� instaluar"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - krijo nj� burim azhurnimi.\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 versioni %s\n"
-"Drejt� ae Autorit (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ky �sht� software gratis i cili mund t� shp�rndahet nd�r termet e GNU GPL.\n"
+"p�rdorim: urmpi.addmedia [options] <emri> <url> [me <shteg relativ�>]\n"
+"ku <url> �sht� nj�ri nga\n"
+"       file://<shtegu>\n"
+"       ftp://<p�rdorues>:<parulla>@<ftues>/<shteg> me <em�r relativ� t� "
+"skedareshdlist>\n"
+"       ftp://<ftues>/<shtegu> me <em�r relativ� t� skedares hdlist>\n"
+"       http://<ftues>/<shtegu> me <em�r relativ� t� skedares hdlist>\n"
+"       removable://<shtegu>\n"
 "\n"
-"p�rdorues:\n"
+"dhe [options] jan� nga\n"
 
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - shpalosi pakot� lira.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"hyrja zhduk�se mungon\n"
+"(nj� nga %s)\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - shpalosi burimet e lira.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "mos zhduk asgj� (p�rdore urpmi.addmedia p�r t� shtuar nj� burim)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
-"  --list-nodes   - shpalosi nyjet kur jan� t� p�rdorura n� --parallel.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - zgjidhi t� gjitha burimet.\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --list-aliass   - shpalosi burimet e lira paralele me pseudonime t� "
-"nj�jta.\n"
+"p�rdorim:urmpi.removemedia [-a] <emri> ...\n"
+"ku <emri> �sht� nj� burim i nxjerrur.\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --headers      - ekstrakto majat p�r pakot e radhitura baza e t� dh�nave\n"
-"                   t� urpmi me dalje standarde (vet�m root).\n"
+"hyrja p�r azhurnim mungon\n"
+"(nj� nga %s)\n"
 
-#: ../urpmq_.c:53
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"  --sources      - jepi t� gjitha burimet e pakove para se t� shkarkohen "
-"(vet�m root).\n"
+"asgj� p�r t� azhurnuar (p�rdore urpmi.addmedia p�r t� shtuar nj� burim)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - shtrij� hetimet n� pakot e mvarura.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d       - forco mbledhjen komplete t� skedares depslist.ordered.\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - zgjidhni t� gjitha burimet jo leviz�se.\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - azhurno vet�m burimet e azhurnuese.\n"
+
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  -u             - zhduk pakot n�se nj� version m� i ri �sht� n� sip�r "
-"instaluar.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - dalje komplete me pakot q� duhet t� zhduken.\n"
+"p�rdorim:urmpi.update [option] <emri> ...\n"
+"ku <emri> �sht� nj� emrim i burimit p�r azhurnim.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - lejon k�rkimet n� pajisje p�r ta gjetur pakon.\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--liste-nodes nuk munden t� p�rdoren me --parallel"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - �faqi grupet njashtu dhe emrat.\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - �faqe versionin me holl�si njashtu dhe emrin.\n"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: mund�si e pa njoftur \"-%s\", verifiko p�rdorimin me --help\n"
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  emrat apo rpm skedaret e marra n� linj�n komanduese jan� n�n hetime.\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--liste-nodes nuk munden t� p�rdoren me --parallel"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - �faqe versionin me holl�si njashtu dhe emrin.\n"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf versioni %s"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - �faqi grupet njashtu dhe emrat.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Drejt� e Autorit (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - lejon k�rkimet n� pajisje p�r ta gjetur pakon.\n"
 
-#: placeholder.h:20
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - dalje komplete me pakot q� duhet t� zhduken.\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 ""
-"Ky �sht� software gratis dhe mund t� shp�rndahet nd�r termet e GNU GPL."
+"  -u             - zhduk pakot n�se nj� version m� i ri �sht� n� sip�r "
+"instaluar.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "p�rdorim: urpmf [options] <skedare>"
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - shtrij� hetimet n� pakot e mvarura.\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         - mos �faq� emrat e etiketave (marr�veshje n�se asnj� "
-"etiket� s'�sht� dh�n�"
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    n� linj�n komanduese me mod� nd�raktiv"
-
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - �faqi t� gjitha etiketat."
+"  --sources      - jepi t� gjitha burimet e pakove para se t� shkarkohen "
+"(vet�m root).\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          - �faqe etiket�n name: rpm skedarja (me marr�veshje n�se "
-"asnj� etiket� nuk �sht� dh�n�"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    n� linj�n komanduese mir�poo pa emr�r t� pakos)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - �faqe etiket�n group: grupi."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - �faqe etiket�n size: madh�sia."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - �faqe etiket�n serial: seri:"
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --sumary        - �faqe etiket�n summary: p�rmbledhje."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - �faqe etiket�n description: p�rshkrim."
+"  --headers      - ekstrakto majat p�r pakot e radhitura baza e t� dh�nave\n"
+"                   t� urpmi me dalje standarde (vet�m root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
-"  --provides      - �faqi etiket� provides: t� gjitha pajisjet (linja t� "
-"shum�fishta)."
+"  --list-aliass   - shpalosi burimet e lira paralele me pseudonime t� "
+"nj�jta.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --requires      - �faqe etiket�n requires: t� gjitha d�shirat� (linja t� "
-"shum�fishta)."
+"  --list-nodes   - shpalosi nyjet kur jan� t� p�rdorura n� --parallel.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr ""
-"  --files         - �faqr etiket�n files: t� gjitha skedaret (linja t� "
-"shum�fishta)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - shpalosi burimet e lira.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr ""
-"  --conflicts     - �faqr etiket�n conflicts: t� gjitha konfliktet (linja t� "
-"shum�fishta)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - shpalosi pakot� lira.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr ""
-"  --obsoletes     - �faqr etiketn obsoletes: t� gjitha absolutisht (linja t� "
-"shum�fishta)."
-
-#: 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       - �faqe etiket�n prereqs: t� gjitha parapraket (linja t� "
-"shum�fishta)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "tento urpmf --help p�r me shum� variante"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "asnj� liste e gjetur komplete p�r burimin"
+"urpmq versioni %s\n"
+"Drejt� ae Autorit (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ky �sht� software gratis i cili mund t� shp�rndahet nd�r termet e GNU GPL.\n"
+"\n"
+"p�rdorues:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl  d�shtoj: dalje me kodin %d apo me sinjalin %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalimi d�shtoj n� nyj�n %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync mungon\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp d�shtoj, ndoshta nj� nyje �sht� e pa-arritur"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync d�shtoj: dalje me kodin %d apo me sinjalin %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput d�shtoj, ndoshta nj� nyje �sht� e pa-arritur"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh mungon\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "n� mod� %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "gabim i sintaks�s n� skedaren e konfigurimit n� rreshtin%s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp d�shtoj n� ftuesin %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "burim n� \"%s\" p�rpjekje p�r p�rdorimin e hdlist n� p�rdorim, burimi i "
-#~ "injoruar"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "makina %s nuk e ka nj� version t� mir� t� urpmi"
 
 #~ msgid "ignoring option \"%s\" not used"
 #~ msgstr "injorim i mund�sis \"%s\" q� nuk p�rdorohet"
diff --git a/po/sr.po b/po/sr.po
index dd87be2f..83c57e5e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,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-02-21 21:41+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -16,1132 +16,1272 @@ 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 "Instaliram %s\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 "DdYydD"
+
+#. 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 "NnNn"
 
-#: ../_irpm_.c:33
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf verzija %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright  (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 ""
-"Automatska instalacija paketa...\n"
-"Zahtevali ste instalaciju paketa %s\n"
+"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima "
+"GNU i GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Da li je ovako dobro?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "upotreba: urpmf [opcije] <fajl>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "U redu"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - ne prikazuje ima taga (standardna opcija ukoliko nije "
+"dat tag u komandi"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Odustani"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    linija, nekompatibilna sa interaktivnim modom)."
 
-#: ../_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 "NnNn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - prikazuje sve tagove."
 
-#: ../_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 "DdYydD"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - prikazuje ime taga: rpm ime datoteke (pretpostavljeno "
+"ukoliko nema taga"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (D/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    komandna linija ali bez imena paketa)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - prikazuje tag grupe: grupa."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - prikazuje tag veli�ine: veli�ina."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - prikazuje serijski tag: serijski."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - prikazuje tag sa�etka: sa�etak."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - prikazuje tag opisa: opis."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - prikazuje tag opcija: sve opcije (multi linije)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - prikazuje tag zahteva: sve potrebe (multi linije)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - prikazuje tag fajl: sve fajlove (u vi�e reda)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - prikazuje tag konflikata: svi konflikti (u vi�e reda)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr "  --obsoletes     - prikazuje tag vi�ak: svi vi�kovi (u vi�e reda)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs         - prikazuje tag zahteva: svi zahtevi (u vi�e reda)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "probajte sa urpmf --help da bi ste dobili spisak dodatnih opcija"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "nisam na�ao punu listu medija"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: komanda nije prona�ena\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Nepoznati webfetch `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (D/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "nepoznati protokol definisan za %s"
+msgid "Cancel"
+msgstr "Odustani"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "webfetch (trenutno surl ili wget) nije prona�en\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "U redu"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ne mogu da podr�im protokol: %s"
+msgid "Is this OK?"
+msgstr "Da li je ovako dobro?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kopiranje neuspelo: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automatska instalacija paketa...\n"
+"Zahtevali ste instalaciju paketa %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "nedostaje wget\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "Instaliram %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget nije uspeo: iza�ao sa %d ili signalom %d\n"
+msgid "unable to open rpmdb"
+msgstr "ne mogu da otvorim rpmdb"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "nedostaje curl\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "ne mogu da pristupim rpm datoteci [%s]"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"medij \"%s\" poku�ava da koristi listu koja je ve� upotrebljena, medij je "
-"ignorisan"
+msgid "%s conflicts with %s"
+msgstr "%s je u konfliktu sa %s"
 
-#: ../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 ""
-"ne mogu da koristim medij \"%s\" po�to se datoteku liste koristi drugi medij"
+msgid "%s is needed by %s"
+msgstr "%s je potrebno za %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"ne mogu da koristim ime \"%s\" kao ime za neimenovani medijum zato �to je to "
-"ime ve� u upotrebi"
+msgid "unable to install package %s"
+msgstr "ne mogu da instaliram paket %s"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "ne mogu da uzmem medij \"%s\" u obzir po�to ne postoji lista [%s] "
+msgid "unable to remove package %s"
+msgstr "ne mogu da uklonim paket %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne mogu da odredim medij za ovaj hdlist fajl [%s]"
+msgid "Preparing..."
+msgstr "Pripremam..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne mogu da pristupim hdlist fajlu za \"%s\", medij je ignorisan"
+msgid "...retrieving failed: %s"
+msgstr "...povra�aj neuspeo: %s"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ne mogu da pristupim fajlu liste za \"%s\", medij ignorisan"
+msgid "...retrieving done"
+msgstr "... dobavljanje zavr�eno"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "poku�avam da premostim postoje�i medij \"%s\", izbegavam"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne mogu da prona�em hdlist datoteku za \"%s\", medijum je ignorisan"
+msgid "malformed input: [%s]"
+msgstr "pogre�an unos: [%s]"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nemogu da prona�em datoteku liste za \"%s\", medijum je ignorisan"
+msgid "unable to access medium \"%s\""
+msgstr "ne mogu da pristupim mediju \"%s\""
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nekoherentna datoteka liste za \"%s\", medij je ignorisan"
+msgid "urpmi database locked"
+msgstr "urpmi baza podataka zaklju�ana"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne mogu da istra�im datoteku liste za \"%s\", medij je ignorisan"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"nekoherentan medij \"%s\" je ozna�en kao prenosni ali to nije u stvarnosti"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previ�e ta�aka montiranja za prenosni medij \"%s\""
+msgid "medium \"%s\" is not selected"
+msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam prenosni ure�aj kao \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu da pro�itam rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koriste�i razli�it prenosni ure�aj ili [%s] za \"%s\""
+msgid "package %s is not found."
+msgstr "paket %s nije prona�en."
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu da dobavim putanju za prenosni medij \"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "medij \"%s\" ne defini�e ni jednu lokaciju za rpm fajlove"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ne mogu da izvr�im upis u konfiguracionu datoteku [%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:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "upisujem u konfiguracionu datoteku [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "postoji vi�e paketa sa istim imenom rpm datoteke \"%s\""
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "Ne mogu da parsiram \"%s\" u fajl [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ne mogu da ispravno parsiram [%s] za vrednost \"%s\""
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "ispitujem paralelni dr�a� u fajlu [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Slede�i paketi sadr�e %s: %s"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "prona�en paralelni dr�a� dza nodove: %s"
+msgid "no package named %s"
+msgstr "Nema paketa sa imenom %s"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "koristim dodeljeni medij za paralelni mod: %s"
+msgid "error registering local packages"
+msgstr "gre�ka pri registrovanju lokalnih paketa"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "ne mogu da pristupim rpm datoteci [%s]"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ne mogu da koristim paralelnu opciju \"%s\""
+msgid "retrieving rpm file [%s] ..."
+msgstr "dobavljam rpm fajl [%s] ..."
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis se ne mo�e koristiti sa --media, --update ili --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "pogre�no ime rpm datoteke [%s]"
 
-#: ../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 "no entries relocated in depslist"
+msgstr "nema preme�tenih unosa u depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "preme�teni %s unosi u depslist"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "demontiram %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "montiram %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "uklanjam %d obsolete hhedere u ke� memoriji"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "prona�eno %d hedera u ke� memoriji"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "ispitujem  hdlist fajl [%s]"
 
-#: ../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]"
 msgstr "ispitujem synthesis fajl [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "problem pri �itanju hdlist fajla sa medija \"%s\""
+msgid "building hdlist [%s]"
+msgstr "kreiram hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "�itam hedere sa medija \"%s\""
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr "sada se proveravaju me�uzavisnosti paketa\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem sa �itanjem synthesis fajla za medij \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "ne mogu da otvorim rpmdb"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medij \"%s\" ve� postoji"
+msgid "nothing written in list file for \"%s\""
+msgstr "nema �ta da se upi�e u datoteku liste za \"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "dodani medij %s"
+msgid "writing list file for medium \"%s\""
+msgstr "upisujem listu fajlova za medij \"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "ne mogu da pristupim prvom instalacionom mediju"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "ne mogu da upi�em datoteku liste za \"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "kopiram hdlist fajl..."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fajl [%s] je ve� koris�ten za isti medij \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kopiranje zavr�eno"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kopiranje zavr�eno"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nije prona�ena hdlist datoteka za medij \"%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)"
-msgstr ""
-"ne mogu da pristupim prvom instalacionom mediju (nije prona�en Mandrake/base/"
-"hdlists fajl)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "povra�aj izvorne hdlist (ili synthesis) neuspeo"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "dobavljam hdlists fajl..."
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "ispitujem MD5SUM fajl"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "... dobavljanje zavr�eno"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "kopiranje izvorne hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...povra�aj neuspeo: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "nepravilan hdlist opis \"%s\" i hdlists fajlu"
+msgid "retrieving description file of \"%s\"..."
+msgstr "dobavljanje opisnog fajla za \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "poku�avam da selektujem inexistant medij \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "nema rpm datoteka na [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ne mogu da pro�itam rpm fajlove sa [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "poku�avam da selektujem vi�estruki medij: %s"
+msgid "reading rpm files from [%s]"
+msgstr "�itam rpm fajlove sa [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "uklanjam medij \"%s\""
+msgid "...copying done"
+msgstr "...kopiranje zavr�eno"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi baza podataka zaklju�ana"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...kopiranje zavr�eno"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu da pristupim mediju \"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "kopiram izvornu listu za \"%s\"..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopiram opisni fajl za \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "kopiranje [%s] neuspelo"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopiranje izvorne hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "kopiranje [%s] neuspelo"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "ispitujem MD5SUM fajl"
+msgid "copying description file of \"%s\"..."
+msgstr "kopiram opisni fajl za \"%s\"..."
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "kopiram izvornu listu za \"%s\"..."
+msgid "removing medium \"%s\""
+msgstr "uklanjam medij \"%s\""
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "�itam rpm fajlove sa [%s]"
+msgid "selecting multiple media: %s"
+msgstr "poku�avam da selektujem vi�estruki medij: %s"
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ne mogu da pro�itam rpm fajlove sa [%s]: %s"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nema rpm datoteka na [%s]"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "poku�avam da selektujem inexistant medij \"%s\""
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "dobavljanje opisnog fajla za \"%s\"..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"ne mogu da pristupim prvom instalacionom mediju (nije prona�en Mandrake/base/"
+"hdlists fajl)"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
-
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "povra�aj izvorne hdlist (ili synthesis) neuspeo"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "nepravilan hdlist opis \"%s\" i hdlists fajlu"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nije prona�ena hdlist datoteka za medij \"%s\""
+msgid "retrieving hdlists file..."
+msgstr "dobavljam hdlists fajl..."
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fajl [%s] je ve� koris�ten za isti medij \"%s\""
+msgid "copying hdlists file..."
+msgstr "kopiram hdlist fajl..."
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
+msgid "unable to access first installation medium"
+msgstr "ne mogu da pristupim prvom instalacionom mediju"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ne mogu da upi�em datoteku liste za \"%s\""
+msgid "added medium %s"
+msgstr "dodani medij %s"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "upisujem listu fajlova za medij \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "medij \"%s\" ve� postoji"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nema �ta da se upi�e u datoteku liste za \"%s\""
-
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "sada se proveravaju me�uzavisnosti paketa\n"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "problem pri �itanju hdlist fajla sa medija \"%s\""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "�itam hedere sa medija \"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis se ne mo�e koristiti sa --media, --update ili --parallel"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "kreiram hdlist [%s]"
+msgid "unable to use parallel option \"%s\""
+msgstr "ne mogu da koristim paralelnu opciju \"%s\""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
+msgid "using associated media for parallel mode: %s"
+msgstr "koristim dodeljeni medij za paralelni mod: %s"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "prona�eno %d hedera u ke� memoriji"
+msgid "found parallel handler for nodes: %s"
+msgstr "prona�en paralelni dr�a� dza nodove: %s"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "uklanjam %d obsolete hhedere u ke� memoriji"
+msgid "examining parallel handler in file [%s]"
+msgstr "ispitujem paralelni dr�a� u fajlu [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "montiram %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "Ne mogu da parsiram \"%s\" u fajl [%s]"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "demontiram %s"
+msgid "write config file [%s]"
+msgstr "upisujem u konfiguracionu datoteku [%s]"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "preme�teni %s unosi u depslist"
+msgid "unable to write config file [%s]"
+msgstr "ne mogu da izvr�im upis u konfiguracionu datoteku [%s]"
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "nema preme�tenih unosa u depslist"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu da dobavim putanju za prenosni medij \"%s\""
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "pogre�no ime rpm datoteke [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "koriste�i razli�it prenosni ure�aj ili [%s] za \"%s\""
 
-#: ../urpm.pm_.c:1853
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "dobavljam rpm fajl [%s] ..."
+msgid "taking removable device as \"%s\""
+msgstr "uzimam prenosni ure�aj kao \"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne mogu da pristupim rpm datoteci [%s]"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "previ�e ta�aka montiranja za prenosni medij \"%s\""
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "ne mogu da pristupim rpm datoteci [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ne mogu da istra�im datoteku liste za \"%s\", medij je ignorisan"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "gre�ka pri registrovanju lokalnih paketa"
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nekoherentna datoteka liste za \"%s\", medij je ignorisan"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "Nema paketa sa imenom %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nemogu da prona�em datoteku liste za \"%s\", medijum je ignorisan"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Slede�i paketi sadr�e %s: %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne mogu da prona�em hdlist datoteku za \"%s\", medijum je ignorisan"
 
-#: ../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\""
-msgstr "postoji vi�e paketa sa istim imenom rpm datoteke \"%s\""
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "poku�avam da premostim postoje�i medij \"%s\", izbegavam"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ne mogu da ispravno parsiram [%s] za vrednost \"%s\""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ne mogu da pristupim fajlu liste za \"%s\", medij ignorisan"
 
-#: ../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)"
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne mogu da pristupim hdlist fajlu za \"%s\", medij je ignorisan"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "medij \"%s\" ne defini�e ni jednu lokaciju za rpm fajlove"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne mogu da odredim medij za ovaj hdlist fajl [%s]"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "paket %s nije prona�en."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "ne mogu da uzmem medij \"%s\" u obzir po�to ne postoji lista [%s] "
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medij \"%s\" nije izabran"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"ne mogu da koristim ime \"%s\" kao ime za neimenovani medijum zato �to je to "
+"ime ve� u upotrebi"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu da pro�itam rpm datoteku [%s] sa medija \"%s\""
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"ne mogu da koristim medij \"%s\" po�to se datoteku liste koristi drugi medij"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"nekoherentan medij \"%s\" je ozna�en kao prenosni ali to nije u stvarnosti"
+"medij \"%s\" poku�ava da koristi listu koja je ve� upotrebljena, medij je "
+"ignorisan"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "pogre�an unos: [%s]"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"medij \"%s\" poku�ava da koristi hdlist koja je ve� kori��ena, medij �e biti "
+"ignorisan"
 
-#: ../urpm.pm_.c:2344
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
+msgid "syntax error in config file at line %s"
+msgstr "sintaksna gre�ka u konfiguracionom fajlu u redu %s"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Pripremam..."
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% zavr�eno, brzina = %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "ne mogu da uklonim paket %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% za %s zavr�eno, ETA = %s, brzina = %s"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "ne mogu da instaliram paket %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync nije uspeo: iza�ao sa %d ili signal %d\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s je potrebno za %s"
+msgid "ssh is missing\n"
+msgstr "nedostaje ssh\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s je u konfliktu sa %s"
+msgid "rsync is missing\n"
+msgstr "nedostaje rsync\n"
 
-#: ../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 nije uspeo, mo�da je mod nedostupan"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl nije uspeo: iza�ao sa %d ili signalom  %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 nije uspeo, mo�da je nod nedostpan"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "nedostaje curl\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "na nodu %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget nije uspeo: iza�ao sa %d ili signalom %d\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 "Instalacija neuspela na nodu %s"
+msgid "wget is missing\n"
+msgstr "nedostaje wget\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 "Instalacija je mogu�a"
+#: ../urpm.pm:1
+#, c-format
+msgid "copy failed: %s"
+msgstr "kopiranje neuspelo: %s"
 
-#: ../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 nije uspeo na hostu %s"
+msgid "unable to handle protocol: %s"
+msgstr "ne mogu da podr�im protokol: %s"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "host %s nema ispravnu verziju urpmi"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "webfetch (trenutno surl ili wget) nije prona�en\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 ""
-"urpmi verzija %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima \n"
-"GNU i GPL.\n"
-"\n"
-"upotreba:\n"
+msgid "unknown protocol defined for %s"
+msgstr "nepoznati protokol definisan za %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         - prikazuje ovaj ekran o pomo�i.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Nepoznati webfetch `%s' !!!\n"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatski selektuje pakete od ponu�enog.\n"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Uklanjanje nije uspelo"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - proverava da li se mo�e izvesti ispravna instalacija.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "Radi zadovoljenja zavisnosti, slede�i paketi �e biti uklonjeni (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - distribuirani urpmi preko ma�ina sa nadimkom.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Proveravam kako bih uklonio slede�e pakete"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nema ni�ega �to bi se moglo ukloniti"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
+msgid "removing package %s will break your system"
+msgstr "uklanjanje paketa %s �e naru�iti Va� sistem"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "nepoznati paket"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "nepoznati paketi"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "uklanjanje paketa %s �e naru�iti Va� sistem"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Nema ni�ega �to bi se moglo ukloniti"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Proveravam kako bih uklonio slede�e pakete"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - distribuirani urpmi preko ma�ina sa nadimkom.\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 "Radi zadovoljenja zavisnosti, slede�i paketi �e biti uklonjeni (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - proverava da li se mo�e izvesti ispravna instalacija.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Uklanjanje nije uspelo"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatski selektuje pakete od ponu�enog.\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         - prikazuje ovaj ekran o pomo�i.\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 ""
-"urpmq verzija %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Ovo je besplatan softver i mo�e biti redistribuiran pod uslovima GNU GPL.\n"
+"urpmi verzija %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima \n"
+"GNU i GPL.\n"
 "\n"
 "upotreba:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo update medij.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"povratni je :\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - koristi samo dati medij, odvojen zarezom.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - desna zagrada za zatvaranje grupe izraza.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - leva zagrada za otovranje grupe izraza.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - verbose re�im.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - binarni NOT, istinit ukoliko je izraz pogre�an.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --quiet         - ne prikazuje ima taga (standardna opcija ukoliko nije "
-"dat tag u komandi\n"
-"                   linija, nekompatibilna sa interaktivnim modom).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - prikazuje sve tagove.\n"
+"  -o             - binarni OR operator, istinit ukoliko je jedan izraz "
+"ta�an.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - prikazuje ime taga: rpm ime datoteke (pretpostavljeno "
-"ukoliko nema taga\n"
-"                   komandna linija ali bez imena paketa).\n"
+"  -a             - inarni AND ooperator, istinit ukoliko su oba izraza "
+"istinita.\n"
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - prikazuje tag grupe: grupa.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - uklju�uje perl kod direktno kao perl -e.\n"
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - prikazuje tag veli�ine: veli�ina.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - prikazuje verziju, izdanje i arhitekturu, uklju�uju�i i "
+"ime.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - prikazuje tag veli�ine: veli�ina.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignori�e razliku u karakteru u bilo kojoj �emi.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - prikazuje tag sa�etka: sa�etak.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr "  --obsoletes     - prikazuje tag vi�ak: svi vi�kovi (u vi�e reda).\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - prikazuje tag opisa: opis.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+"  --conflicts     - prikazuje tag konflikata: svi konflikti (u vi�e reda).\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr "  --provides      - prikazuje tag opcija: sve opcije (multi linije).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr "  --files         - prikazuje tag fajl: sve fajlove (u vi�e reda).\n"
 
-#: ../urpmf_.c:47
+#: ../urpmf:1
+#, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
 "  --requires      - prikazuje tag zahteva: sve potrebe (multi linije).\n"
 
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - prikazuje tag fajl: sve fajlove (u vi�e reda).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+msgstr "  --provides      - prikazuje tag opcija: sve opcije (multi linije).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr ""
-"  --conflicts     - prikazuje tag konflikata: svi konflikti (u vi�e reda).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - prikazuje tag opisa: opis.\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr "  --obsoletes     - prikazuje tag vi�ak: svi vi�kovi (u vi�e reda).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - prikazuje tag sa�etka: sa�etak.\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignori�e razliku u karakteru u bilo kojoj �emi.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - prikazuje tag veli�ine: veli�ina.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - prikazuje verziju, izdanje i arhitekturu, uklju�uju�i i "
-"ime.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - prikazuje tag veli�ine: veli�ina.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - uklju�uje perl kod direktno kao perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - prikazuje tag grupe: grupa.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - inarni AND ooperator, istinit ukoliko su oba izraza "
-"istinita.\n"
+"  --name          - prikazuje ime taga: rpm ime datoteke (pretpostavljeno "
+"ukoliko nema taga\n"
+"                   komandna linija ali bez imena paketa).\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - prikazuje sve tagove.\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -o             - binarni OR operator, istinit ukoliko je jedan izraz "
-"ta�an.\n"
+"  --quiet         - ne prikazuje ima taga (standardna opcija ukoliko nije "
+"dat tag u komandi\n"
+"                   linija, nekompatibilna sa interaktivnim modom).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - binarni NOT, istinit ukoliko je izraz pogre�an.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - verbose re�im.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - leva zagrada za otovranje grupe izraza.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - desna zagrada za zatvaranje grupe izraza.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - koristi samo dati medij, odvojen zarezom.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"povratni je :\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo update medij.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"upotreba: urpmi.addmedia [opcije] <ime> <url> [with <relativnom_putanja>]\n"
-"gde je <url> jedan od\n"
-"       file://<putanja>\n"
-"       ftp://<login>:<lozinka>@<host>/<putanja> with <relativno ime datoteke "
-"sahdlist>\n"
-"       ftp://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
-"       http://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
+"urpmq verzija %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Ovo je besplatan softver i mo�e biti redistribuiran pod uslovima GNU GPL.\n"
 "\n"
-"       removable://<putanja>\n"
+"upotreba:\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         - koristi wget za dobavljanje udaljenih fajlova.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "sve je ve� instalirano"
 
-#: ../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         - koristi curl za dobavljanje udaljenih fajlova.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacija je mogu�a"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limitira brzinu download-a.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspela"
 
-#: ../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        - koristi specificirani HTTP proxy, proj porta se "
-"pretpostavlja\n"
-"                   da je 1080 po default-u (format je <proxyhost[:port]>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - odre�uje korisnika i lozinku koji se koriste za proxy\n"
-"                   autentifikaciju (format je <user:password>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - kreira update medij.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distribuiram %s\n"
 
-#: ../urpmi.addmedia_.c:62
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --distrib      - automatski napravi sve medije sa instalacionog\n"
-"                    medija.\n"
+"Instalacija neuspela, nedostaju neki fajlovi.\n"
+"%s\n"
+"Mo�da �elite da a�urirate va�u urpmi bazu podataka."
 
-#: ../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  - automatski napravi medijum za XXX-ti deo\n"
-"                     distrubiucije, XXX mo�e da bude glavni, dodatak\n"
-"                     nadogradnja ili blio �ta drugo �to mo�e da se "
-"podesi ;-)\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (d/N) "
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --form        - koristi datu url adresu za list mirora, podrazumevano je\n"
-"                    %s\n"
+msgid "Do you want to continue installation ?"
+msgstr "Da li �elite da nastavite konfiguraciju ?"
 
-#: ../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"
-msgstr ""
-"  --version      - koristi datu verziju distribucije, default je uzeta\n"
-"                   iz verzije distribucije koja je navedena u\n"
-"                   deinstaliranom mandrake-release paketu.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Slede�i paketi imaju neispravne potpise"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch       - koristi datu arhitekturu, podrazumevanoa je arhitektura\n"
-"                    instaliranog Mandrake paketa.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Pritisnite enter kada budete spremni..."
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - �isti direktorijum sa ke�om nadglavlja.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ubacite medij sa imenom %s u ure�aj [%s]"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "izvor paketa nije dostupan, izlazim..."
 
-#: ../urpmi.addmedia_.c:75
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"  -h             - poku�ava da prona�e i iskoristi synthesis ili "
-"hdlist                      fajl.\n"
-
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - primorava na generisanje hdlist fajlova.\n"
-
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "ne mogu da dodam nadogradnje cooker distribuciji\n"
+"Radi zadovoljenja zavisnosti, slede�i paketi �e biti instalirani (%d MB)"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi: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 ""
+"Morate da imate root ovla��enja da bi instalirali slede�e pakete:\n"
 "%s\n"
-"nedostaje <relativna putanja hdlist> sa --distrib"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne mogu da a�uriram medij \"%s\"\n"
-
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
+"do you agree ?"
 msgstr ""
+"Slede�i paketi se moraju ukloniti da bi drugi mogli da budu a�urirani:\n"
 "%s\n"
-"nedostaje <relativna putanja hdlist>\n"
+"da li se sla�ete ?"
+
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr "nezahtevano"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "zbog konflikta sa %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "zbog ne postojanja %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "zbog ne zadovoljenog %s"
+
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "da bi instalirao %s"
+
+#: ../urpmi:1
 #, c-format
 msgid ""
+"Some package requested cannot be installed:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"Neki izabrani paketi se ne mogu instalirati:\n"
 "%s\n"
-"`with' nedostaje za ftp medij\n"
+"da li se sla�ete ?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne mogu da kreiram medij \"%s\"\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Pogre�an izbor, probajte ponovo\n"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"upotreba: urpmi.removemedia [-a] <ime> ...\n"
-"gde je <ime> ime medija za uklanjanje.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "�ta �elite? (1-%d) "
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selektuje sve medije.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Potreban(i) su slede�i paket(i):"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznate opcije '%s'\n"
+msgid "One of the following packages is needed to install %s:"
+msgstr "Jedan od slede�ih paketa je potreban da bi instalirali %s:"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nema ni�ega za brisanje (koristi urpmi.addmedia za dodavanje medija)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Samo administrator mo�e da instalira pakete"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"nedostaje unos za brisanje\n"
-"(jedan od %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "koristim dato okru�enje na %s\n"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"upotreba: urpmi.update [opcije] <ime> ...\n"
-"gde <ime> jeste ime medija za a�uriranje.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "ne mogu da napravim direktorijum [%s] za izve�taj o gre�ci"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - a�uriraj samo medijum za a�uriranje.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"�ta se mo�e u�initi sa binarnim rpm paketima kada se koristi opcija --"
+"install-src"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - selektuje sve ne prenosive medije.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - primorava na kompletno prora�unavanje depslist.ordered "
-"fajla.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "lo�a proxydeklaracija u komandnoj liniji\n"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"nema ni�ega za a�uriranje (koristi urpmi.addmedia za dodavanje medija)\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  imena ili rpm fajlovi dati u komandnoj liniji �e biti instalirani.\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"nedostaje unos za a�uriranje\n"
-"(jedan od %s)\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - verbose re�im.\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"
-msgstr ""
-"urpmi verzija %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima \n"
-"GNU i GPL. upotreba:\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi re�im (malo poruka).\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
-
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automatska izbor paketa da bi se a�urirao sistem.\n"
+"  -s             - slede�i paket je izvorni paket (isto kao i  --src).\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - uzrokuje fuzzy pretragu (isto kao -y).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - uzrokuje fuzzy pretragu (kao i  --fuzzy).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - slede�i paket je izvorni paket (isto kao i  -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ne pretra�uje dostupne radi nala�enja paketa.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instalira samo pakete sa izvornim kodom.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p            - dozvoljava pretra�ivanje po pru�anju radi nala�enja "
+"paketa.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean      - uklanja rpm iz ke�a pre bilo �ega drugog.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - bira sva poklapanja u komandnoj liniji.\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - �uva rpm koji nisu kori��eni u ke�u.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - isklju�uje putanju razdvojenu zarezom.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --force        - primorava na invokaciju �ak i ako neki paketi ne "
-"postoje.\n"
+"  --verify-rpm   - verifikuje rpm potpise pre instalacije.\n"
+"                   (--no-verify-rpm ne verigikuje, standardna je "
+"verifikacija).\n"
 
-#: ../urpmi_.c:84
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --allow-nodeps - dozvoljava upit za korisnika da li da instalira pakete "
-"bez\n"
-"                   provere me�uzavisnosti paketa.\n"
+"  --best-output  - bira najbolji interfejs shodno okru�enju:\n"
+"                   X ili tekstualni mod.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - koristi X interfejs.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --allow-force  - dozovoljava upit korisnika da li �eli da instalira pakete "
-"bez\n"
-"                   provere me�uzavisnosti i integriteta.\n"
+"  --env          - koristi specifi�no okru�enje (tipi�no izve�taj o "
+"gre�ci).\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1149,455 +1289,482 @@ msgstr ""
 "  --bug          - pravi izve�taj o gre�ci u direktorijumu prosle�enom "
 "kao                      slede�i argument.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --env          - koristi specifi�no okru�enje (tipi�no izve�taj o "
-"gre�ci).\n"
-
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - koristi X interfejs.\n"
+"  --proxy-user   - odre�uje korisnika i lozinku koji se koriste za proxy\n"
+"                   autentifikaciju (format je <user:password>).\n"
 
-#: ../urpmi_.c:101
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --best-output  - bira najbolji interfejs shodno okru�enju:\n"
-"                   X ili tekstualni mod.\n"
+"  --proxy        - koristi specificirani HTTP proxy, proj porta se "
+"pretpostavlja\n"
+"                   da je 1080 po default-u (format je <proxyhost[:port]>).\n"
 
-#: ../urpmi_.c:103
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
-msgstr ""
-"  --verify-rpm   - verifikuje rpm potpise pre instalacije.\n"
-"                   (--no-verify-rpm ne verigikuje, standardna je "
-"verifikacija).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limitira brzinu download-a.\n"
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - isklju�uje putanju razdvojenu zarezom.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - koristi curl za dobavljanje udaljenih fajlova.\n"
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - bira sva poklapanja u komandnoj liniji.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - koristi wget za dobavljanje udaljenih fajlova.\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  -p            - dozvoljava pretra�ivanje po pru�anju radi nala�enja "
-"paketa.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ne pretra�uje dostupne radi nala�enja paketa.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - uzrokuje fuzzy pretragu (kao i  --fuzzy).\n"
+"  --allow-force  - dozovoljava upit korisnika da li �eli da instalira pakete "
+"bez\n"
+"                   provere me�uzavisnosti i integriteta.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -s             - slede�i paket je izvorni paket (isto kao i  --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tihi re�im (malo poruka).\n"
-
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - verbose re�im.\n"
-
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  imena ili rpm fajlovi dati u komandnoj liniji �e biti instalirani.\n"
+"  --allow-nodeps - dozvoljava upit za korisnika da li da instalira pakete "
+"bez\n"
+"                   provere me�uzavisnosti paketa.\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
-
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"�ta se mo�e u�initi sa binarnim rpm paketima kada se koristi opcija --"
-"install-src"
+"  --force        - primorava na invokaciju �ak i ako neki paketi ne "
+"postoje.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "ne mogu da napravim direktorijum [%s] za izve�taj o gre�ci"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - �uva rpm koji nisu kori��eni u ke�u.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "koristim dato okru�enje na %s\n"
-
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Samo administrator mo�e da instalira pakete"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean      - uklanja rpm iz ke�a pre bilo �ega drugog.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jedan od slede�ih paketa je potreban da bi instalirali %s:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Potreban(i) su slede�i paket(i):"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instalira samo pakete sa izvornim kodom.\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "�ta �elite? (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - slede�i paket je izvorni paket (isto kao i  -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Pogre�an izbor, probajte ponovo\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - uzrokuje fuzzy pretragu (isto kao -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 ""
-"Neki izabrani paketi se ne mogu instalirati:\n"
-"%s\n"
-"da li se sla�ete ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - automatska izbor paketa da bi se a�urirao sistem.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "da bi instalirao %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "zbog ne zadovoljenog %s"
+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 verzija %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima \n"
+"GNU i GPL. upotreba:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "zbog ne postojanja %s"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne mogu da a�uriram medij \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "zbog konflikta sa %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "nezahtevano"
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne mogu da kreiram medij \"%s\"\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 ""
-"Slede�i paketi se moraju ukloniti da bi drugi mogli da budu a�urirani:\n"
 "%s\n"
-"da li se sla�ete ?"
+"`with' nedostaje za ftp medij\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"Radi zadovoljenja zavisnosti, slede�i paketi �e biti instalirani (%d MB)"
+"%s\n"
+"nedostaje <relativna putanja hdlist>\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 ""
-"Morate da imate root ovla��enja da bi instalirali slede�e pakete:\n"
 "%s\n"
+"nedostaje <relativna putanja hdlist> sa --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "izvor paketa nije dostupan, izlazim..."
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "dobavljam rpm fajl [%s] ..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% za %s zavr�eno, ETA = %s, brzina = %s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "ne mogu da dodam nadogradnje cooker distribuciji\n"
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% zavr�eno, brzina = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nepoznate opcije '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ubacite medij sa imenom %s u ure�aj [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Pritisnite enter kada budete spremni..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Slede�i paketi imaju neispravne potpise"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - primorava na generisanje hdlist fajlova.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Da li �elite da nastavite konfiguraciju ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - poku�ava da prona�e i iskoristi synthesis ili "
+"hdlist                      fajl.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (d/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - �isti direktorijum sa ke�om nadglavlja.\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 ""
-"Instalacija neuspela, nedostaju neki fajlovi.\n"
-"%s\n"
-"Mo�da �elite da a�urirate va�u urpmi bazu podataka."
+"  --arch       - koristi datu arhitekturu, podrazumevanoa je arhitektura\n"
+"                    instaliranog Mandrake paketa.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Instalacija nije uspela"
+#: ../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      - koristi datu verziju distribucije, default je uzeta\n"
+"                   iz verzije distribucije koja je navedena u\n"
+"                   deinstaliranom mandrake-release paketu.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distribuiram %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --form        - koristi datu url adresu za list mirora, podrazumevano je\n"
+"                    %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
+#: ../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  - automatski napravi medijum za XXX-ti deo\n"
+"                     distrubiucije, XXX mo�e da bude glavni, dodatak\n"
+"                     nadogradnja ili blio �ta drugo �to mo�e da se "
+"podesi ;-)\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatski napravi sve medije sa instalacionog\n"
+"                    medija.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "sve je ve� instalirano"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - kreira update medij.\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 verzija %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ovo je besplatan softver i mo�e biti redistribuiran pod uslovima GNU GPL.\n"
+"upotreba: urpmi.addmedia [opcije] <ime> <url> [with <relativnom_putanja>]\n"
+"gde je <url> jedan od\n"
+"       file://<putanja>\n"
+"       ftp://<login>:<lozinka>@<host>/<putanja> with <relativno ime datoteke "
+"sahdlist>\n"
+"       ftp://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
+"       http://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
 "\n"
-"upotreba:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - prikazuje listu paketa.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media         - prikazuje listu medija.\n"
+"       removable://<putanja>\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         - prikazuje listu �vorova pri kori��enju opcije --"
-"parallel.\n"
+"nedostaje unos za brisanje\n"
+"(jedan od %s)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases         - prikazuje listu paralelnih alijasa.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nema ni�ega za brisanje (koristi urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmq_.c:51
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selektuje sve medije.\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      - ekstraktuje hedere za pakete prikazane iz urpmi db na\n"
-"                   stdout (samo root).\n"
+"upotreba: urpmi.removemedia [-a] <ime> ...\n"
+"gde je <ime> ime medija za uklanjanje.\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      - prikazuje sve izvorne pakete pre download-a (samo root).\n"
+"nedostaje unos za a�uriranje\n"
+"(jedan od %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - pro�iruje pretragu na zavisnost paketa.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nema ni�ega za a�uriranje (koristi urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - uklanja pakete ukoliko je novija verzija ve� "
-"instalirana.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c              - potpun izlaz sa paketom koji treba da se ukloni.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - pretraga unazad za onim �to zahteva paket.\n"
+"  -d             - primorava na kompletno prora�unavanje depslist.ordered "
+"fajla.\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - prikazuje grupe uklju�uju�i i ime.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - selektuje sve ne prenosive medije.\n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - prikazuje verziju uklju�uju�i i ime.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - a�uriraj samo medijum za a�uriranje.\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  imena ili rpm fajlovi koji su dati u komandnoj liniji se proveravaju.\n"
+"upotreba: urpmi.update [opcije] <ime> ...\n"
+"gde <ime> jeste ime medija za a�uriranje.\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --list-nodes se mo�e koristiti samo sa opcijom --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf verzija %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu da pro�itam rpm datoteku \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright  (C) 1999,2000,2001,2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima "
-"GNU i GPL."
+"  imena ili rpm fajlovi koji su dati u komandnoj liniji se proveravaju.\n"
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "upotreba: urpmf [opcije] <fajl>"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - prikazuje verziju uklju�uju�i i ime.\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --quiet         - ne prikazuje ima taga (standardna opcija ukoliko nije "
-"dat tag u komandi"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - prikazuje grupe uklju�uju�i i ime.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    linija, nekompatibilna sa interaktivnim modom)."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - pretraga unazad za onim �to zahteva paket.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - prikazuje sve tagove."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c              - potpun izlaz sa paketom koji treba da se ukloni.\n"
 
-#: placeholder.h:25
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --name          - prikazuje ime taga: rpm ime datoteke (pretpostavljeno "
-"ukoliko nema taga"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    komandna linija ali bez imena paketa)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - prikazuje tag grupe: grupa."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - prikazuje tag veli�ine: veli�ina."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - prikazuje serijski tag: serijski."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - prikazuje tag sa�etka: sa�etak."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - prikazuje tag opisa: opis."
-
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - prikazuje tag opcija: sve opcije (multi linije)."
-
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - prikazuje tag zahteva: sve potrebe (multi linije)."
+"  -u             - uklanja pakete ukoliko je novija verzija ve� "
+"instalirana.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - prikazuje tag fajl: sve fajlove (u vi�e reda)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - pro�iruje pretragu na zavisnost paketa.\n"
 
-#: placeholder.h:35
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --conflicts     - prikazuje tag konflikata: svi konflikti (u vi�e reda)."
+"  --sources      - prikazuje sve izvorne pakete pre download-a (samo root).\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr "  --obsoletes     - prikazuje tag vi�ak: svi vi�kovi (u vi�e reda)."
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - ekstraktuje hedere za pakete prikazane iz urpmi db na\n"
+"                   stdout (samo root).\n"
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases         - prikazuje listu paralelnih alijasa.\n"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --prereqs         - prikazuje tag zahteva: svi zahtevi (u vi�e reda)."
+"  --list-nodes         - prikazuje listu �vorova pri kori��enju opcije --"
+"parallel.\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "probajte sa urpmf --help da bi ste dobili spisak dodatnih opcija"
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media         - prikazuje listu medija.\n"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "nisam na�ao punu listu medija"
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - prikazuje listu paketa.\n"
+
+#: ../urpmq: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"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq verzija %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je besplatan softver i mo�e biti redistribuiran pod uslovima GNU GPL.\n"
+"\n"
+"upotreba:\n"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl nije uspeo: iza�ao sa %d ili signalom  %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Instalacija neuspela na nodu %s"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "nedostaje rsync\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp nije uspeo, mo�da je nod nedostpan"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync nije uspeo: iza�ao sa %d ili signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput nije uspeo, mo�da je mod nedostupan"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "nedostaje ssh\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "na nodu %s"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "sintaksna gre�ka u konfiguracionom fajlu u redu %s"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp nije uspeo na hostu %s"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "medij \"%s\" poku�ava da koristi hdlist koja je ve� kori��ena, medij �e "
-#~ "biti ignorisan"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "host %s nema ispravnu verziju urpmi"
 
 #~ msgid "Remove them all?"
 #~ msgstr "Da ih uklonim sve?"
@@ -1621,12 +1788,6 @@ msgstr "nisam na�ao punu listu medija"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - prikazuje ovu poruku o pomo�i.\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: ne mogu da pro�itam rpm datoteku \"%s\"\n"
-
 #~ msgid "avoid selecting %s as its locales language is not already selected"
 #~ msgstr "izbegavam selektovanje %s po�to njen lokalni jezik nije izabran"
 
@@ -1705,9 +1866,6 @@ msgstr "nisam na�ao punu listu medija"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "lo�a proxydeklaracija u komandnoj liniji\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr ""
 #~ "usage: urpmi.addmedia [opcije] <ime> <url> [sah <relativnom_putanjom>]"
diff --git a/po/sv.po b/po/sv.po
index c0753729..c5c1de8f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sv-sv-sv\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-02-22 18:05+0100\n"
 "Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
 "Language-Team: svenska <sv@li.org>\n"
@@ -21,1132 +21,1254 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "installerar %s\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 "Nn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf version %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright � 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 ""
-"Automatisk installation av paket...\n"
-"Du beg�rde installation av paketet %s\n"
+"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "�r det OK?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "anv�ndning: urpmf [flaggor] <fil>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "OK"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet         - visa inte taggen \"name\" (antas om ingen tagg angivits "
+"p�"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Avbryt"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    kommandoraden, fungerar ej i interaktivt l�ge)."
 
-#: ../_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 "Nn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - visa alla taggar."
 
-#: ../_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          - visa taggen \"name\": rpm-filnamnet (antas om ingen tagg "
+"angivits p�"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    kommandoraden, men utan paketnamn)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - visa taggen \"group\": grupp."
 
-#: ../_irpm_.c:63
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - visa taggen \"size\": storlek."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - visa taggen \"serial\": serienummer."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - visa taggen \"summary\": sammanfattning."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   - visa taggen \"description\": beskrivning."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - visa taggen \"provides\": allt som tillhandah�lls (flera "
+"rader)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr ""
+"  --requires      - visa taggen \"requires\": allt som kr�vs (flera rader)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - visa taggen \"files\": alla filer (flera rader)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --conflicts     - visa taggen \"conflicts\": alla konflikter (flera rader)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --obsoletes     - visa taggen \"obsoletes\": allt som ers�tts (flera "
+"rader)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - visa taggen \"prereqs\": alla f�rhandskrav (flera rader)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "prova urpmf --help f�r fler flaggor"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "ingen fullst�ndig medialista hittades"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: kommandot kunde inte hittas\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Ok�nd webbh�mtare \"%s\".\n"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "ok�nt protokoll definierat f�r %s"
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "ingen webbh�mtare (f�r n�rvarande curl eller wget) hittades\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "kan inte hantera protokoll: %s"
+msgid "Is this OK?"
+msgstr "�r det OK?"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "kopiering misslyckades: %s"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automatisk installation av paket...\n"
+"Du beg�rde installation av paketet %s\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget saknas\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "installerar %s\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget misslyckades: avslutade med %d eller signal %d\n"
+msgid "unable to open rpmdb"
+msgstr "kunde inte �ppna RPM-db"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl saknas\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "kan inte l�sa rpm-fil [%s]"
 
-#: ../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 �r i konflikt med %s"
 
-#: ../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 kr�vs av %s"
 
-#: ../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 "kan inte installera paket %s"
 
-#: ../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 "kan inte ta bort paket %s"
 
-#: ../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 "kan inte l�sa rpm-fil [%s]"
+msgid "...retrieving failed: %s"
+msgstr "Borttagning misslyckades"
 
-#: ../urpm.pm_.c:600
-#, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "kan inte l�sa rpm-fil [%s]"
+#: ../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 "kunde ej skapa media \"%s\"\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 "kunde ej skapa media \"%s\"\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 "kunde ej skapa media \"%s\"\n"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "F�ljande paket inneh�ller %s: %s"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
+msgid "no package named %s"
+msgstr "ok�nda paket"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "error registering local packages"
+msgstr ""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
 msgstr "kan inte l�sa rpm-fil [%s]"
 
-#: ../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 "kan inte l�sa rpm-fil [%s]"
 
-#: ../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 "kunde ej uppdatera media \"%s\"\n"
-
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--list-nodes kan endast anv�ndas med --parallel"
+msgid "mounting %s"
+msgstr "installerar %s\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 "kunde inte �ppna RPM-db"
-
-#: ../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 "kan inte l�sa rpm-fil [%s]"
-
-#: ../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 "kopiering misslyckades: %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 "Borttagning misslyckades"
+msgid "unable to write list file of \"%s\""
+msgstr "kunde ej skapa media \"%s\"\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 "kunde ej skapa media \"%s\"\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "kunde ej uppdatera media \"%s\"\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 "kunde ej skapa media \"%s\"\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 "kopiering misslyckades: %s"
-
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "kan inte l�sa rpm-fil [%s]"
 
-#: ../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 "kan inte l�sa rpm-fil [%s]"
+msgid "...copying failed"
+msgstr "kopiering misslyckades: %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 "kopiering misslyckades: %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 "kunde ej uppdatera media \"%s\"\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 "kunde ej skapa media \"%s\"\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 "kan inte l�sa rpm-fil [%s]"
+
+#: ../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 "installerar %s\n"
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--list-nodes kan endast anv�ndas med --parallel"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "kunde ej uppdatera media \"%s\"\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 "kan inte l�sa rpm-fil [%s]"
 
-#: ../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 "kan inte l�sa rpm-fil [%s]"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "kan inte l�sa rpm-fil [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kunde ej skapa media \"%s\"\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 "ok�nda paket"
-
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "F�ljande paket inneh�ller %s: %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 "kunde ej skapa media \"%s\"\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 "kunde ej skapa media \"%s\"\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "kan inte l�sa rpm-fil [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kan inte l�sa rpm-fil [%s]"
 
-#: ../urpm.pm_.c:2260
+#: ../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 "kan inte ta bort paket %s"
+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 "kan inte installera paket %s"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "syntax error in config file at line %s"
+msgstr "kan inte l�sa rpm-fil [%s]"
+
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s kr�vs av %s"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% klart, hastighet=%s"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �r i konflikt med %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% av %s klart ETA=%s, hastighet=%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 misslyckades, kanske �r en nod ej n�bar."
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync misslyckades: avslutade med %d eller signal %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 misslyckades, kanske �r en nod ej n�bar."
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh saknas\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr "p� nod %s"
+msgid "rsync is missing\n"
+msgstr "rsync saknas\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 "Installationen misslyckades p� nod %s"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl misslyckades: avslutade med %d eller signal %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 "Installation �r m�jlig"
+#: ../urpm.pm:1
+#, c-format
+msgid "curl is missing\n"
+msgstr "curl saknas\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 misslyckades p� v�rddator %s"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget misslyckades: avslutade med %d eller signal %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 "datorn %s har en d�lig version av urpmi"
+msgid "wget is missing\n"
+msgstr "wget saknas\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 version %s\n"
-"Copyright � 1999, 2000, 2001, 2002 Mandrakesoft.\n"
-"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
-"\n"
-"anv�ndning:\n"
+msgid "copy failed: %s"
+msgstr "kopiering misslyckades: %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         - visar det h�r hj�lpmeddelandet.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "kan inte hantera protokoll: %s"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - v�lj automatiskt ett paket fr�n valen.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "ingen webbh�mtare (f�r n�rvarande curl eller wget) hittades\n"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "ok�nt protokoll definierat f�r %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Ok�nd webbh�mtare \"%s\".\n"
+
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Borttagning misslyckades"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - verifiera om installationen kan utf�ras korrekt.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr ""
+"F�r att tillfredsst�lla beroenden kommer f�ljande paket att tas bort (%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - distribuerad urpmi �ver alla maskiner med alias.\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Kontrollerar f�r att ta bort f�ljande paket"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - v�lj alla paket som matchar uttryck.\n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ingenting att ta bort"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: ok�nd flagga \"-%s\", anv�nd --help f�r hj�lp\n"
+msgid "removing package %s will break your system"
+msgstr "att ta bort paketet %s skulle f�rst�ra systemet"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "ok�nt paket"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "ok�nda paket"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "att ta bort paketet %s skulle f�rst�ra systemet"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: ok�nd flagga \"-%s\", anv�nd --help f�r hj�lp\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Ingenting att ta bort"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - v�lj alla paket som matchar uttryck.\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Kontrollerar f�r att ta bort f�ljande paket"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - distribuerad urpmi �ver alla maskiner med alias.\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 ""
-"F�r att tillfredsst�lla beroenden kommer f�ljande paket att tas bort (%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - verifiera om installationen kan utf�ras korrekt.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Borttagning misslyckades"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - v�lj automatiskt ett paket fr�n valen.\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         - visar det h�r hj�lpmeddelandet.\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 version %s\n"
-"Copyright � 2002 MandrakeSoft.\n"
+"urpme version %s\n"
+"Copyright � 1999, 2000, 2001, 2002 Mandrakesoft.\n"
 "Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
 "\n"
 "anv�ndning:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - anv�nd endast uppdateringsmedia.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"�teranrop �r:\n"
+"%s\n"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media         - anv�nd endast givet media, separerat med komma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - h�ger parentes f�r att st�nga grupputtryck.\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - anv�nd given synthesis ist�llet f�r urpmi db.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - v�nster parentes f�r att �ppna grupputtryck.\n"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose             - utf�rligt l�ge.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - un�r NOT, sant om uttycket �r falskt.\n"
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-"  --quiet        - visa inte taggnamnet (standard om ingen tagg ges p� "
-"kommando-\n"
-"                   raden, ej kompatibelt med interaktivt l�ge).\n"
-
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - visa alla taggar.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr "  -o             - bin�r OR operator, sant om ett uttryck �r sant.\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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --name          - visa taggnamn: rpm-filnamn (antas om ingen tagg angivits "
-"p�\n"
-"                    kommandoraden men utan paketnamn).\n"
-
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - visa taggen \"group\": grupp.\n"
-
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - visa taggen \"size\": storlek.\n"
+"  -a             - bin�r AND operator, sant om b�da uttrycken �r sanna.\n"
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - visa taggen \"epoch\": epoch.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inkludera perl-kod direkt som perl -e.\n"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - visa taggen \"summary\": sammanfattning.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - visa version, utg�va och arkitektur med namn.\n"
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - visa taggen \"description\": beskrivning.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - versaler och gemener j�mf�rs lika i varje m�nster.\n"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
 msgstr ""
-"  --provides      - visa taggen \"provides\": allt som tillhandah�lls (flera "
+"  --obsoletes     - visa taggen \"obsoletes\": allt som ers�tts (flera "
 "rader).\n"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
 msgstr ""
-"  --requires      - visa taggen \"requires\": allt som kr�vs (flera rader).\n"
+"  --conflicts     - visa taggen \"conflicts\": alla konflikter (flera "
+"rader).\n"
 
-#: ../urpmf_.c:48
+#: ../urpmf:1
+#, c-format
 msgid "  --files        - print tag files: all files (multiple lines).\n"
 msgstr "  --files         - visa taggen \"files\": alla filer (flera rader).\n"
 
-#: ../urpmf_.c:49
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
-"  --conflicts     - visa taggen \"conflicts\": alla konflikter (flera "
-"rader).\n"
+"  --requires      - visa taggen \"requires\": allt som kr�vs (flera rader).\n"
 
-#: ../urpmf_.c:50
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
-"  --obsoletes     - visa taggen \"obsoletes\": allt som ers�tts (flera "
+"  --provides      - visa taggen \"provides\": allt som tillhandah�lls (flera "
 "rader).\n"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - versaler och gemener j�mf�rs lika i varje m�nster.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - visa taggen \"description\": beskrivning.\n"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - visa version, utg�va och arkitektur med namn.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - visa taggen \"summary\": sammanfattning.\n"
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inkludera perl-kod direkt som perl -e.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - visa taggen \"epoch\": epoch.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - visa taggen \"size\": storlek.\n"
 
-#: ../urpmf_.c:54
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - visa taggen \"group\": grupp.\n"
+
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"  -a             - bin�r AND operator, sant om b�da uttrycken �r sanna.\n"
+"  --name          - visa taggnamn: rpm-filnamn (antas om ingen tagg angivits "
+"p�\n"
+"                    kommandoraden men utan paketnamn).\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - visa alla taggar.\n"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr "  -o             - bin�r OR operator, sant om ett uttryck �r sant.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - visa inte taggnamnet (standard om ingen tagg ges p� "
+"kommando-\n"
+"                   raden, ej kompatibelt med interaktivt l�ge).\n"
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - un�r NOT, sant om uttycket �r falskt.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose             - utf�rligt l�ge.\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - v�nster parentes f�r att �ppna grupputtryck.\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - anv�nd given synthesis ist�llet f�r urpmi db.\n"
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - h�ger parentes f�r att st�nga grupputtryck.\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media         - anv�nd endast givet media, separerat med komma.\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
-"�teranrop �r:\n"
-"%s\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - anv�nd endast uppdateringsmedia.\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"anv�ndning: urpmi.addmedia [flaggor] <namn> <webbadress (url)> [with "
-"<relativ_s�kv�g>]\n"
-"d�r <webbadress> �r en av\n"
-"       file://<s�kv�g>\n"
-"       ftp://<anv�ndarnamn>:<l�senord>@<v�rddator>/<s�kv�g> with <relativt "
-"filnamn till hdlist>\n"
-"       ftp://<v�rddator>/<s�kv�g> with <relativt filnamn till hdlist>\n"
-"       http://<v�rddator>/<s�kv�g> with <relativt filnamn till hdlist>\n"
-"       removable://<s�kv�g>\n"
+"urpmf version %s\n"
+"Copyright � 2002 MandrakeSoft.\n"
+"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
 "\n"
-"och [flaggor] �r fr�n\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         - anv�nd wget f�r att h�mta fj�rrfiler.\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         - anv�nd curl f�r att h�mta fj�rrfiler.\n"
+"anv�ndning:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - begr�nsa nedladdningshastigheten.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "allt �r redan installerat"
 
-#: ../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        - anv�nd specificerad HTTP-proxy, portnumret antas\n"
-"                   vara 1080 som standard (formatet �r <proxydator[:port]"
-">).\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Installation �r m�jlig"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - ange anv�ndare och l�senord f�r proxy-\n"
-"                   autentisering (formatet �r <anv�ndare:l�senord>).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installationen misslyckades"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - skapa ett uppdateringsmedia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "F�rs�ka �nnu h�rdare att installera (--force)? (j/N)"
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - skapa automatiskt all media fr�n ett\n"
-"                 installationsmedia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/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  - skapa automatiskt ett medium f�r XXX-delen av en\n"
-"                   distribution, XXX kan vara huvuddelen, \"contrib\", "
-"uppdateringar eller\n"
-"                   n�gonting annat som har blivit inst�llt.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "distribuerar %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --from         - anv�nd specificerad url f�r en lista av speglingar, "
-"standard �r\n"
-"                   %s\n"
+"Installationen misslyckades, vissa filer saknas:\n"
+"%s\n"
+"Du b�r f�rs�ka uppdatera urpmi-databasen."
 
-#: ../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"
-msgstr ""
-"  --version      - anv�nd specificerad distributionsversion, f�rvalet\n"
-"                   h�mtas fr�n distributionens version som talas om av\n"
-"                   det installerade paketet mandrake-release.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
-"  --arch         - anv�nd specificerad akritektur, f�rvalt �r arkitekturen\n"
-"                   i installerat mandrake-release-paket.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Vill du forts�tta installationen?"
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - rensa huvudcachekatalogen.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "F�ljande paket har felaktiga signaturer"
 
-#: ../urpmi.addmedia_.c:75
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr ""
-"  -h             - f�rs�k att hitta och anv�nda synthesis eller\n"
-"                 hdlist-fil.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Tryck \"Enter\" vid klart..."
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - tvinga generering av hdlist-filer.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "L�gg i media med namnet \"%s\" i enhet [%s]"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "kan inte l�gga till uppdateringar fr�n en cooker-distribution\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "kunde inte l�sa k�llan, avbryter"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-"%s\n"
-"beh�ver inte ange <relativ s�kv�g till hdlist> med --distrib"
-
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kunde ej uppdatera media \"%s\"\n"
+"F�r att tillfredsst�lla beroenden kommer f�ljande paket att installeras (%d "
+"MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"Du m�ste vara root f�r att kunna installera f�ljande beroenden:\n"
 "%s\n"
-"<relativ s�kv�g till hdlist> saknas\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 ""
+"F�ljande paket m�ste tas bort f�r att andra ska bli uppdaterade:\n"
 "%s\n"
-"\"with\" saknas f�r ftp-media\n"
+"OK?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kunde ej skapa media \"%s\"\n"
+msgid "unrequested"
+msgstr "obeg�rd"
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"anv�ndning: urpmi.removemedia [-a] <namn>...\n"
-"d�r <namn> �r medianamnet som ska tas bort.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "p� grund av konflikter med %s"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - v�lj all media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr "f�r att %s saknas"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ok�nda flaggor \"%s\"\n"
+msgid "due to unsatisfied %s"
+msgstr "p� grund av otillr�ckliga %s"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "inget att ta bort (anv�nd urpmi.addmedia f�r att l�gga till media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "f�r att installera %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 ""
-"objektet som ska tas bort saknas\n"
-"(en av %s)\n"
+"Vissa beg�rda paket kan inte installeras:\n"
+"%s\n"
+"OK?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"anv�ndning: urpmi.update [flaggor] <namn>...\n"
-"d�r <namn> �r medianamnet som ska uppdateras.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Felaktigt val, f�rs�k igen.\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - uppdatera endast uppdateringsmedia.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Vad �r ditt val? ( 1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - v�lj all icke-flyttbar media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Ett av f�ljande paket �r n�dv�ndigt:"
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-"  -d             - tvinga fullst�ndig ber�kning av filen depslist.ordered.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Ett av f�ljande paket �r n�dv�ndigt f�r att installera %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "inget att uppdatera (anv�nd urpmi.addmedia f�r att l�gga till media)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Endast systemadministrat�rer f�r installera paket"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"objektet som ska uppdateras saknas\n"
-"(en av %s)\n"
+msgid "using specific environment on %s\n"
+msgstr "anv�nder specifik milj� p� %s\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"
-msgstr ""
-"urpmi version %s\n"
-"Copyright � 1999, 2000, 2001, 2002 Mandrakesoft.\n"
-"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
-"\n"
-"anv�ndning:\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Kunde inte skapa katalog [%s] f�r felrapport"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - anv�nd given synthesis ist�llet f�r urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Vad kan g�ras med bin�ra RPM-filer n�r -install-src anv�nds"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ok�nd flagga \"-%s\", anv�nd --help f�r hj�lp\n"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"  --auto-select  - v�lj automatiskt paket f�r att uppdatera systemet.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - kr�v luddig s�kning (samma som -y).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  namn eller rpm-filer som anges p� kommandoraden installeras.\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - n�sta paket �r ett k�llpaket (samma som -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - utf�rligt l�ge.\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - installa endast k�llpaket (inga bin�rer).\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tyst l�ge.\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean      - ta bort rpm fr�n cache f�re allt annat.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - n�sta paket �r ett k�llpaket (samma som --src).\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - beh�ll rpm som inte anv�nds i cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - kr�v luddig s�kning (samma som --fuzzy).\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - tvinga anv�ndning �ven om vissa paket inte finns.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - s�k inte i \"provides\" f�r att hitta paket.\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --allow-nodeps - till�ter anv�ndaren installera paket utan\n"
-"                   att kontrollera beroenden.\n"
+"  -p             - till�t s�kning i \"provides\" f�r att hitta paket.\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - v�lj alla tr�ffar p� kommandoraden.\n"
+
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - undantagss�kv�g separerad av komma.\n"
+
+#: ../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  - till�ter anv�ndaren att installera paket utan\n"
-"                   kontroll av beroenden och integritet.\n"
+"  --verify-rpm   - verifiera rpm-signatur f�re installation\n"
+"                     (--no-verify-rpm inaktiverar det, standard �r "
+"aktiverat).\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          - mata ut en felrapport i katalogen som indikeras av\n"
-"                n�sta arg.\n"
+"  --best-output  - v�lj det b�sta gr�nssnittet enligt milj�n:\n"
+"                   X eller textl�ge.\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - anv�nd X-gr�nssnitt.\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1154,435 +1276,484 @@ msgstr ""
 "  --env          - anv�nd specifik milj� (vanligen en\n"
 "                 felrapport).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - anv�nd X-gr�nssnitt.\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  - v�lj det b�sta gr�nssnittet enligt milj�n:\n"
-"                   X eller textl�ge.\n"
+"  --bug          - mata ut en felrapport i katalogen som indikeras av\n"
+"                n�sta arg.\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   - verifiera rpm-signatur f�re installation\n"
-"                     (--no-verify-rpm inaktiverar det, standard �r "
-"aktiverat).\n"
-
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - undantagss�kv�g separerad av komma.\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - v�lj alla tr�ffar p� kommandoraden.\n"
+"  --proxy-user   - ange anv�ndare och l�senord f�r proxy-\n"
+"                   autentisering (formatet �r <anv�ndare:l�senord>).\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\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 ""
-"  -p             - till�t s�kning i \"provides\" f�r att hitta paket.\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - s�k inte i \"provides\" f�r att hitta paket.\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - kr�v luddig s�kning (samma som --fuzzy).\n"
-
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - n�sta paket �r ett k�llpaket (samma som --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tyst l�ge.\n"
+"  --proxy        - anv�nd specificerad HTTP-proxy, portnumret antas\n"
+"                   vara 1080 som standard (formatet �r <proxydator[:port]"
+">).\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - utf�rligt l�ge.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - begr�nsa nedladdningshastigheten.\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  namn eller rpm-filer som anges p� kommandoraden installeras.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - anv�nd curl f�r att h�mta fj�rrfiler.\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: ok�nd flagga \"-%s\", anv�nd --help f�r hj�lp\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - anv�nd wget f�r att h�mta fj�rrfiler.\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Vad kan g�ras med bin�ra RPM-filer n�r -install-src anv�nds"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - till�ter anv�ndaren att installera paket utan\n"
+"                   kontroll av beroenden och integritet.\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Kunde inte skapa katalog [%s] f�r felrapport"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - till�ter anv�ndaren installera paket utan\n"
+"                   att kontrollera beroenden.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "anv�nder specifik milj� p� %s\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - tvinga anv�ndning �ven om vissa paket inte finns.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Endast systemadministrat�rer f�r installera paket"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - beh�ll rpm som inte anv�nds i cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Ett av f�ljande paket �r n�dv�ndigt f�r att installera %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean      - ta bort rpm fr�n cache f�re allt annat.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Ett av f�ljande paket �r n�dv�ndigt:"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - installa endast k�llpaket (inga bin�rer).\n"
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Vad �r ditt val? ( 1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - n�sta paket �r ett k�llpaket (samma som -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Felaktigt val, f�rs�k igen.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - kr�v luddig s�kning (samma som -y).\n"
 
-#: ../urpmi_.c:381
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"Vissa beg�rda paket kan inte installeras:\n"
-"%s\n"
-"OK?"
+"  --auto-select  - v�lj automatiskt paket f�r att uppdatera systemet.\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, c-format
-msgid "in order to install %s"
-msgstr "f�r att installera %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - anv�nd given synthesis ist�llet f�r urpmi db.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "p� grund av otillr�ckliga %s"
+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 version %s\n"
+"Copyright � 1999, 2000, 2001, 2002 Mandrakesoft.\n"
+"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
+"\n"
+"anv�ndning:\n"
 
-#: ../urpmi_.c:409
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to missing %s"
-msgstr "f�r att %s saknas"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kunde ej uppdatera media \"%s\"\n"
 
-#: ../urpmi_.c:414
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "p� grund av konflikter med %s"
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr "obeg�rd"
+msgid "unable to create medium \"%s\"\n"
+msgstr "kunde ej skapa media \"%s\"\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 ""
-"F�ljande paket m�ste tas bort f�r att andra ska bli uppdaterade:\n"
 "%s\n"
-"OK?"
+"\"with\" saknas f�r ftp-media\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)"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"F�r att tillfredsst�lla beroenden kommer f�ljande paket att installeras (%d "
-"MB)"
+"%s\n"
+"<relativ s�kv�g till hdlist> saknas\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 ""
-"Du m�ste vara root f�r att kunna installera f�ljande beroenden:\n"
 "%s\n"
+"beh�ver inte ange <relativ s�kv�g till hdlist> med --distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "kunde inte l�sa k�llan, avbryter"
-
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% av %s klart ETA=%s, hastighet=%s"
+msgid "retrieving mirrors at %s ..."
+msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% klart, hastighet=%s"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "kan inte l�gga till uppdateringar fr�n en cooker-distribution\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 "L�gg i media med namnet \"%s\" i enhet [%s]"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Tryck \"Enter\" vid klart..."
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ok�nda flaggor \"%s\"\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "F�ljande paket har felaktiga signaturer"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - tvinga generering av hdlist-filer.\n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "Vill du forts�tta installationen?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr ""
+"  -h             - f�rs�k att hitta och anv�nda synthesis eller\n"
+"                 hdlist-fil.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (j/N) "
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - rensa huvudcachekatalogen.\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 ""
-"Installationen misslyckades, vissa filer saknas:\n"
-"%s\n"
-"Du b�r f�rs�ka uppdatera urpmi-databasen."
+"  --arch         - anv�nd specificerad akritektur, f�rvalt �r arkitekturen\n"
+"                   i installerat mandrake-release-paket.\n"
 
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
+#: ../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      - anv�nd specificerad distributionsversion, f�rvalet\n"
+"                   h�mtas fr�n distributionens version som talas om av\n"
+"                   det installerade paketet mandrake-release.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "distribuerar %s\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - anv�nd specificerad url f�r en lista av speglingar, "
+"standard �r\n"
+"                   %s\n"
 
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
+#: ../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  - skapa automatiskt ett medium f�r XXX-delen av en\n"
+"                   distribution, XXX kan vara huvuddelen, \"contrib\", "
+"uppdateringar eller\n"
+"                   n�gonting annat som har blivit inst�llt.\n"
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "F�rs�ka �nnu h�rdare att installera (--force)? (j/N)"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - skapa automatiskt all media fr�n ett\n"
+"                 installationsmedia.\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "allt �r redan installerat"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - skapa ett uppdateringsmedia.\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 version %s\n"
-"Copyright � 2000, 2001, 2002 MandrakeSoft.\n"
-"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
+"anv�ndning: urpmi.addmedia [flaggor] <namn> <webbadress (url)> [with "
+"<relativ_s�kv�g>]\n"
+"d�r <webbadress> �r en av\n"
+"       file://<s�kv�g>\n"
+"       ftp://<anv�ndarnamn>:<l�senord>@<v�rddator>/<s�kv�g> with <relativt "
+"filnamn till hdlist>\n"
+"       ftp://<v�rddator>/<s�kv�g> with <relativt filnamn till hdlist>\n"
+"       http://<v�rddator>/<s�kv�g> with <relativt filnamn till hdlist>\n"
+"       removable://<s�kv�g>\n"
 "\n"
-"anv�ndning:\n"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list           - visa tillg�ngliga paket.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   -   visa tillg�nglig media.\n"
+"och [flaggor] �r fr�n\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   - visa tillg�ngliga noder vid anv�ndning av --parallel.\n"
+"objektet som ska tas bort saknas\n"
+"(en av %s)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - lista tillg�ngliga parallellalias.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "inget att ta bort (anv�nd urpmi.addmedia f�r att l�gga till media)\n"
+
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - v�lj all media.\n"
 
-#: ../urpmq_.c:51
+#: ../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      - packa upp huvuden f�r paket fr�n urpmi-db till\n"
-"                   standard ut (endast root).\n"
+"anv�ndning: urpmi.removemedia [-a] <namn>...\n"
+"d�r <namn> �r medianamnet som ska tas bort.\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - ge alla k�llpaket f�re nedladdning (endast root).\n"
-
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  -d             - ut�ka f�rfr�gning till att omfatta paketberoenden.\n"
+"objektet som ska uppdateras saknas\n"
+"(en av %s)\n"
 
-#: ../urpmq_.c:64
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "inget att uppdatera (anv�nd urpmi.addmedia f�r att l�gga till media)\n"
+
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
-"  -u             - ta bort paket om en nyare version redan �r installerad.\n"
+"  -d             - tvinga fullst�ndig ber�kning av filen depslist.ordered.\n"
 
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - v�lj all icke-flyttbar media.\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - uppdatera endast uppdateringsmedia.\n"
+
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"  -c             - fullst�ndig utmatning med paketet som ska tas bort.\n"
+"anv�ndning: urpmi.update [flaggor] <namn>...\n"
+"d�r <namn> �r medianamnet som ska uppdateras.\n"
 
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - omv�nd s�kning f�r vad som kr�vs av paket.\n"
+#: ../urpmq:1
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes kan endast anv�ndas med --parallel"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - visa grupper med namn.\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - visa version och utg�va med namn.\n"
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: ok�nd flagga \"-%s\", anv�nd --help f�r hj�lp\n"
 
-#: ../urpmq_.c:73
+#: ../urpmq:1
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  namn eller rpm-filer som anges p� kommandoraden f�rfr�gas.\n"
 
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes kan endast anv�ndas med --parallel"
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - visa version och utg�va med namn.\n"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf version %s"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - visa grupper med namn.\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright � 1999, 2000, 2001, 2002 MandrakeSoft."
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - omv�nd s�kning f�r vad som kr�vs av paket.\n"
 
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#: ../urpmq:1
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
-"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL."
-
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "anv�ndning: urpmf [flaggor] <fil>"
+"  -c             - fullst�ndig utmatning med paketet som ska tas bort.\n"
 
-#: placeholder.h:22
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --quiet         - visa inte taggen \"name\" (antas om ingen tagg angivits "
-"p�"
+"  -u             - ta bort paket om en nyare version redan �r installerad.\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                    kommandoraden, fungerar ej i interaktivt l�ge)."
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+"  -d             - ut�ka f�rfr�gning till att omfatta paketberoenden.\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr "  --all           - visa alla taggar."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - ge alla k�llpaket f�re nedladdning (endast root).\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          - visa taggen \"name\": rpm-filnamnet (antas om ingen tagg "
-"angivits p�"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    kommandoraden, men utan paketnamn)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - visa taggen \"group\": grupp."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - visa taggen \"size\": storlek."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - visa taggen \"serial\": serienummer."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - visa taggen \"summary\": sammanfattning."
-
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --description   - visa taggen \"description\": beskrivning."
+"  --headers      - packa upp huvuden f�r paket fr�n urpmi-db till\n"
+"                   standard ut (endast root).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr ""
-"  --provides      - visa taggen \"provides\": allt som tillhandah�lls (flera "
-"rader)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - lista tillg�ngliga parallellalias.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --requires      - visa taggen \"requires\": allt som kr�vs (flera rader)."
+"  --list-nodes   - visa tillg�ngliga noder vid anv�ndning av --parallel.\n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - visa taggen \"files\": alla filer (flera rader)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   -   visa tillg�nglig media.\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr ""
-"  --conflicts     - visa taggen \"conflicts\": alla konflikter (flera rader)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list           - visa tillg�ngliga paket.\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr ""
-"  --obsoletes     - visa taggen \"obsoletes\": allt som ers�tts (flera "
-"rader)."
-
-#: 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       - visa taggen \"prereqs\": alla f�rhandskrav (flera rader)."
+"urpmq version %s\n"
+"Copyright � 2000, 2001, 2002 MandrakeSoft.\n"
+"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
+"\n"
+"anv�ndning:\n"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "prova urpmf --help f�r fler flaggor"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "Installationen misslyckades p� nod %s"
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "ingen fullst�ndig medialista hittades"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "rshp misslyckades, kanske �r en nod ej n�bar."
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl misslyckades: avslutade med %d eller signal %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "mput misslyckades, kanske �r en nod ej n�bar."
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync saknas\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr "p� nod %s"
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync misslyckades: avslutade med %d eller signal %d\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp misslyckades p� v�rddator %s"
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh saknas\n"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "datorn %s har en d�lig version av urpmi"
diff --git a/po/tg.po b/po/tg.po
index e6c6f0d3..d138e4ee 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,7 +6,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-03-05 15:58+0500\n"
 "Last-Translator: Dilshod Marupov <dma165@hotmail.com>\n"
 "Language-Team: Tajik\n"
@@ -15,617 +15,815 @@ 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\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 "ҲҳYy"
 
-#: ../_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 "НнNn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "нашри urpmf %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Ҳуқуқи муаллифӣ (С) 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 ""
-"Коргузориши автоматикии қуттиҳо...\n"
-"Шумо коргузориши куттии '%s'-ро талаб кардед\n"
+"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
+"шавад."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Ин дуруст аст?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "истифода: urpmf [хосиятҳо] <файл>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Ok"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --хомӯш         - номи тэгро чоп накунед (пешфарз агар ягон тэг дар фармон "
+"набошад"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "Бекор кардан"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "\t\t\t    сатр, номувофиқ аст бо усули интерактивӣ)."
 
-#: ../_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 "НнNn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr " --ҳама      \t  - чопи ҳама тэгҳо."
 
-#: ../_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 "ҲҳYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --ном           - чопи номи тэг: номи файли rpm (қабул шуд агар тэг дода "
+"нашуда бошад"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (Ҳ/н) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    сатри фармон вале бе номи қутти)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr " --гурӯҳ          - чопи гурӯҳи тэг: гурӯҳ."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --ҳаҷм          - чопи ҳаҷми тэг: ҳаҷм."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --силсила       - чопи силсилаи тэг: силсила."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --ҷамъбаст      - чопи ҷамъбасти тэг: ҷамъбаст."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --тасвирот      - чопи тасвироти тэг: тасвирот."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --таъминот      - чопи таъминоти тэг: ҳама таъминот (сатрҳои зиёд)."
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr " --дархостҳо     - чопи дархостҳои тэг: ҳама дархостҳо (сатрҳои зиёд)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr " --файлҳо        - чопи файлҳои тэг: ҳама файлҳо (сатрҳои зиёд)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+"  --зиддиятҳо     - чопи зиддиятҳои тэг: ҳама зиддиятҳо (сатрҳои зиёд)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+"  --кӯҳнашудаҳо   - чопи кӯҳнашудаҳои тэг: ҳама кӯҳнашудаҳо (сатрҳои зиёд)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr " --заминаҳо      - чопи заминаҳои тэг: ҳама заминаҳо (сатрҳои зиёд)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "барои интихоби зиёдтар urpmf --help-ро интихоб кунед"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr ""
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: фармон ёфта нашуд\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (Ҳ/н) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
-
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr ""
+msgid "Cancel"
+msgstr "Бекор кардан"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "даста кардани қарордод номумкин: %s"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "copy failed: %s"
-msgstr "нусхабардорӣ нагузашт: %s"
+msgid "Is this OK?"
+msgstr "Ин дуруст аст?"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Коргузориши автоматикии қуттиҳо...\n"
+"Шумо коргузориши куттии '%s'-ро талаб кардед\n"
 
-#: ../urpm.pm_.c:288
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
+msgid "installing %s\n"
+msgstr "коргузории %s\n"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to open rpmdb"
+msgstr "кушодани rpmdb номумкин"
 
-#: ../urpm.pm_.c:556
-#, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"муҳити \"%s\" кӯшиш мекунад, ки рӯйхати истифодашударо истифода барад,муҳит "
-"рад шуд"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "дохилшавии файли rpm-и [%s] номумкин"
 
-#: ../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"
+msgid "%s conflicts with %s"
 msgstr ""
-"аз паи муҳити \"%s\" шудан номумкин чунки файли рӯйхат аллакай бо муҳити "
-"дигар истифода шудааст"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "%s is needed by %s"
 msgstr ""
-"истифодаи номи \"%s\" барои муҳити беном номумкин, ин ном аллакай истифода "
-"шудааст"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "unable to install package %s"
+msgstr "кор гузоштани қуттии %s номумкин"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to remove package %s"
+msgstr "хориҷи қуттии %s номумкин"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "Preparing..."
 msgstr ""
-"гирифтани муҳити \"%s\" ба ҳисобот аз барои вуҷуд надоштани рӯйхати файли [%"
-"s] номумкин"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "барқароркунии [%s]"
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "...retrieving done"
+msgstr "барқароркунии [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "барқароркунии [%s]"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "муайян кардани муҳити ин файли hdlist-и [%s] номумкин"
+msgid "malformed input: [%s]"
+msgstr "даровардани бад: [%s]"
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "дохилшавии файли hdlist-и \"%s\" номумкин, муҳит рад шуд"
+msgid "unable to access medium \"%s\""
+msgstr "дохилшавии муҳити \"%s\" номумкин"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
+msgid "urpmi database locked"
+msgstr ""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "кӯшиши гузаштани муҳити вуҷуддоштаи \"%s\", кандашавӣ"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"муҳити бемуносибати \"%s\" ҳамчун ивазшаванда ишора шудааст, локиннодуруст"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ёфтани файли hdlist барои \"%s\" номумкин, муҳит рад шуд"
+msgid "medium \"%s\" is not selected"
+msgstr "муҳити \"%s\" интихоб нашудааст"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "дарёфти файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "файли рӯйхати бемуносибат барои \"%s\", муҳит рад шуд"
+msgid "package %s is not found."
+msgstr "қуттии %s ёфт нашуд."
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
-"аз назар гузаронидани файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm_.c:690
-#, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "офаридани муҳити \"%s\" номумкин\n"
+#: ../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)"
+msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "қуттиҳои зиёде бо чунин номи файли rpm-и \"%s\" вуҷуд доранд"
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "таҷзияи дурсти [%s] дар қиммати \"%s\" номумкин"
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "офаридани муҳити \"%s\" номумкин\n"
+#: ../urpm.pm:1 ../urpme:1
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Қуттиҳои зерин соҳиби %s: %s"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "навиштани файли танзимдарории [%s] номумкин"
+msgid "no package named %s"
+msgstr "қуттии бо номи %s нест"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "файли танзимдарории [%s] нависед"
+msgid "error registering local packages"
+msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "unable to register rpm file"
 msgstr "дохилшавии файли rpm-и [%s] номумкин"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "хондани файли hdlist-и [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "барқароркунии [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "номи файли rpm-и нодурусти [%s]"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "хондани файли hdlist-и [%s]"
+msgid "no entries relocated in depslist"
+msgstr "элементҳои %s-и ҷойивазшуда дар depslist"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "relocated %s entries in depslist"
+msgstr "элементҳои %s-и ҷойивазшуда дар depslist"
 
-#: ../urpm.pm_.c:784
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "нав кардани муҳити \"%s\" номумкин\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unmounting %s"
+msgstr "ҷудокунии %s"
 
-#: ../urpm.pm_.c:795
-#, fuzzy
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--list-nodes танҳо истифода бурда мешавад бо --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "васлкунии %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "хориҷи сарлавҳаҳои кӯҳнашудаи %d дар кэш"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "%d сарлавҳаҳо дар кэш ёфт шуданд"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
 
-#: ../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
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "хондани файли hdlist-и [%s]"
 
-#: ../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
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "хондани файли hdlist-и [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
+#, c-format
+msgid "building hdlist [%s]"
+msgstr "офариниши hdlist [%s]"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
+msgid "reading headers from medium \"%s\""
+msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
 
-#: ../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 "performing second pass to compute dependencies\n"
+msgstr ""
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "кушодани rpmdb номумкин"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "муҳити \"%s\" аллакай вуҷуд дорад"
+msgid "nothing written in list file for \"%s\""
+msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "added medium %s"
-msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
+msgid "writing list file for medium \"%s\""
+msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
 
-#: ../urpm.pm_.c:933
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
 
-#: ../urpm.pm_.c:937
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "хондани файли hdlist-и [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying done"
-msgstr "барқароркунии [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "таҷзияи файли hdlist - и \"%s\" номумкин"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "нусхабардорӣ нагузашт: %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
 
-#: ../urpm.pm_.c:941 ../urpm.pm_.c:959 ../urpm.pm_.c:984
-#, fuzzy
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr ""
 
-#: ../urpm.pm_.c:947
-#, fuzzy
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
 msgstr "хондани файли hdlist-и [%s]"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-#, fuzzy
-msgid "...retrieving done"
-msgstr "барқароркунии [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
 
-#: ../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"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "барқароркунии [%s]"
 
-#: ../urpm.pm_.c:975
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
-
-#: ../urpm.pm_.c:1017
-#, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving description file of \"%s\"..."
+msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr ""
+msgid "no rpm files found from [%s]"
+msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
-
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr ""
+msgid "reading rpm files from [%s]"
+msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "дохилшавии муҳити \"%s\" номумкин"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying done"
+msgstr "барқароркунии [%s]"
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
+msgid "...copying failed"
+msgstr "нусхабардорӣ нагузашт: %s"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "copying source list of \"%s\"..."
 msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "нусхаи [%s] нагузашт"
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-#, fuzzy
-msgid "examining MD5SUM file"
-msgstr "хондани файли hdlist-и [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
+msgid "copying description file of \"%s\"..."
 msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
+msgid "removing medium \"%s\""
+msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
+msgid "selecting multiple media: %s"
+msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
+msgid "\"%s\""
+msgstr ""
 
-#: ../urpm.pm_.c:1285
-#, fuzzy, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "барқароркунии [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm:1
+#, c-format
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving hdlists file..."
+msgstr "хондани файли hdlist-и [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying hdlists file..."
+msgstr "хондани файли hdlist-и [%s]"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access first installation medium"
+msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "added medium %s"
+msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
+msgid "medium \"%s\" already exists"
+msgstr "муҳити \"%s\" аллакай вуҷуд дорад"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--list-nodes танҳо истифода бурда мешавад бо --parallel"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "нав кардани муҳити \"%s\" номумкин\n"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1480
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "таҷзияи файли hdlist - и \"%s\" номумкин"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "хондани файли hdlist-и [%s]"
 
-#: ../urpm.pm_.c:1519
-#, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "хондани файли hdlist-и [%s]"
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "дохилшавии файли rpm-и [%s] номумкин"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
+msgid "write config file [%s]"
+msgstr "файли танзимдарории [%s] нависед"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr ""
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr "навиштани файли танзимдарории [%s] номумкин"
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "офаридани муҳити \"%s\" номумкин\n"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "using different removable device [%s] for \"%s\""
 msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
 
-#: ../urpm.pm_.c:1597
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "офариниши hdlist [%s]"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "taking removable device as \"%s\""
+msgstr "кӯшиши хориҷи муҳити вуҷуд надоштаи \"%s\""
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "офаридани муҳити \"%s\" номумкин\n"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d сарлавҳаҳо дар кэш ёфт шуданд"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"аз назар гузаронидани файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "хориҷи сарлавҳаҳои кӯҳнашудаи %d дар кэш"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "файли рӯйхати бемуносибат барои \"%s\", муҳит рад шуд"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "васлкунии %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "дарёфти файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "ҷудокунии %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ёфтани файли hdlist барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "элементҳои %s-и ҷойивазшуда дар depslist"
-
-#: ../urpm.pm_.c:1834
-#, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "элементҳои %s-и ҷойивазшуда дар depslist"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "кӯшиши гузаштани муҳити вуҷуддоштаи \"%s\", кандашавӣ"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "номи файли rpm-и нодурусти [%s]"
-
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "барқароркунии [%s]"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "дохилшавии файли rpm-и [%s] номумкин"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "дохилшавии файли hdlist-и \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "дохилшавии файли rpm-и [%s] номумкин"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "муайян кардани муҳити ин файли hdlist-и [%s] номумкин"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"гирифтани муҳити \"%s\" ба ҳисобот аз барои вуҷуд надоштани рӯйхати файли [%"
+"s] номумкин"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "қуттии бо номи %s нест"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"истифодаи номи \"%s\" барои муҳити беном номумкин, ин ном аллакай истифода "
+"шудааст"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Қуттиҳои зерин соҳиби %s: %s"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"аз паи муҳити \"%s\" шудан номумкин чунки файли рӯйхат аллакай бо муҳити "
+"дигар истифода шудааст"
 
-#: ../urpm.pm_.c:2105 ../urpm.pm_.c:2137 ../urpm.pm_.c:2159
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "қуттиҳои зиёде бо чунин номи файли rpm-и \"%s\" вуҷуд доранд"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"муҳити \"%s\" кӯшиш мекунад, ки рӯйхати истифодашударо истифода барад,муҳит "
+"рад шуд"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "таҷзияи дурсти [%s] дар қиммати \"%s\" номумкин"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"муҳити \"%s\"кӯшиш мекунад, ки hdlist-и истифодашударо истифода барад,муҳит "
+"рад шуд"
 
-#: ../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 "syntax error in config file at line %s"
+msgstr "хатогии таркибӣ дар сатри %s дар файли танзимдарор"
+
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "қуттии %s ёфт нашуд."
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "муҳити \"%s\" интихоб нашудааст"
+msgid "ssh is missing\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
+msgid "rsync is missing\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
-"муҳити бемуносибати \"%s\" ҳамчун ивазшаванда ишора шудааст, локиннодуруст"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "даровардани бад: [%s]"
+msgid "curl is missing\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "барқароркунии [%s]"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "хориҷи қуттии %s номумкин"
+msgid "copy failed: %s"
+msgstr "нусхабардорӣ нагузашт: %s"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "кор гузоштани қуттии %s номумкин"
+msgid "unable to handle protocol: %s"
+msgstr "даста кардани қарордод номумкин: %s"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../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"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../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"
+#: ../urpme:1
+#, c-format
+msgid "Removing failed"
+msgstr "Хориҷкунӣ нагузашт"
+
+#: ../urpme:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpme:1
 #, c-format
-msgid "on node %s"
+msgid "Checking to remove the following packages"
+msgstr "Тафтишкунӣ барои хориҷи қуттиҳои зерин"
+
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
+#: ../urpme:1
 #, c-format
-msgid "Installation failed on node %s"
-msgstr "Коргузорӣ дар гиреҳи %s нагузашт"
+msgid "removing package %s will break your system"
+msgstr ""
 
-#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:624 ../urpmi_.c:629
-msgid "Installation is possible"
-msgstr "Коргузорӣ мумкин аст"
+#: ../urpme:1
+#, c-format
+msgid "unknown package"
+msgstr "қуттии номаълум"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpme:1
 #, c-format
-msgid "scp failed on host %s"
-msgstr "scp дар хидматгори %s нагузашт"
+msgid "unknown packages"
+msgstr "қуттиҳои номаълум"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpme:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
+
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - интихоби ҳамаи қуттиҳои бо ифода мувофиқ буда.\n"
+
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpme_.c:39
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../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 "  --ёрӣ         - чопи ин пайғоми ёрӣ.\n"
+
+#: ../urpme:1
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -642,68 +840,158 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../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 "  --ёрӣ         - чопи ин пайғоми ёрӣ.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - қавси рост барои пӯшидани ифодаи гурӯҳ.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - қавси чап барои кушодани ифодаи гурӯҳ.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - ягонӣ НЕ, рост агар ифода дурӯғ бошад.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - дарбаргирии рамзи perl бевосита ҳамчун perl -e.\n"
+
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - интихоби ҳамаи қуттиҳои бо ифода мувофиқ буда.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
 
-#: ../urpme_.c:64
+#: ../urpmf:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+"  --кӯҳнашудаҳо   - чопи кӯҳнашудаҳои тэг: ҳама кӯҳнашудаҳо (сатрҳои зиёд).\n"
 
-#: ../urpme_.c:83
-msgid "unknown package"
-msgstr "қуттии номаълум"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+"  --зиддиятҳо     - чопи зиддиятҳои тэг: ҳама зиддиятҳо (сатрҳои зиёд).\n"
 
-#: ../urpme_.c:83
-msgid "unknown packages"
-msgstr "қуттиҳои номаълум"
+#: ../urpmf:1
+#, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr " --файлҳо        - чопи файлҳои тэг: ҳама файлҳо (сатрҳои зиёд).\n"
 
-#: ../urpme_.c:93
+#: ../urpmf:1
 #, c-format
-msgid "removing package %s will break your system"
+msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr ""
+" --дархостҳо     - чопи дархостҳои тэг: ҳама дархостҳо (сатрҳои зиёд).\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
+#: ../urpmf:1
+#, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
 msgstr ""
+"  --таъминот      - чопи таъминоти тэг: ҳама таъминот (сатрҳои зиёд).\n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Тафтишкунӣ барои хориҷи қуттиҳои зерин"
+#: ../urpmf:1
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --тасвирот      - чопи тасвироти тэг: тасвирот.\n"
 
-#: ../urpme_.c:105
+#: ../urpmf:1
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --ҷамъбаст      - чопи ҷамъбасти тэг: ҷамъбаст.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - чопи epoch тэг: epoch.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --ҳаҷм          - чопи ҳаҷми тэг: ҳаҷм.\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr " --гурӯҳ          - чопи гурӯҳи тэг: гурӯҳ.\n"
+
+#: ../urpmf:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
 msgstr ""
-"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
+"  --ном           - чопи номи тэг: номи файли rpm (қабул шуд агар тэг дар\n"
+"                   сатри фармон дода нашуда бошад вале бе номи қутти).\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Хориҷкунӣ нагузашт"
+#: ../urpmf:1
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --ҳама          - чопи ҳама тэгҳо.\n"
 
-#: ../urpmf_.c:26
+#: ../urpmf:1
+#, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --хомӯш         - номи тэгро чоп накунед (пешфарз агар ягон тэг дар фармон "
+"набошад\n"
+"                   сатр, номувофиқ аст бо усули интерактивӣ).\n"
+
+#: ../urpmf:1
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
+
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - танҳо муҳити навкунӣ истифода баред.\n"
+
+#: ../urpmf:1
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -720,341 +1008,349 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - танҳо муҳити навкунӣ истифода баред.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "ҳамааш аллакай кор гузошта шуд"
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
-"  --media        - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "Коргузорӣ мумкин аст"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "Коргузорӣ нагузашт"
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н)  "
 
-#: ../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 ""
-"  --хомӯш         - номи тэгро чоп накунед (пешфарз агар ягон тэг дар фармон "
-"набошад\n"
-"                   сатр, номувофиқ аст бо усули интерактивӣ).\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
 
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --ҳама          - чопи ҳама тэгҳо.\n"
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "тақсимкунии %s\n"
 
-#: ../urpmf_.c:39
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --ном           - чопи номи тэг: номи файли rpm (қабул шуд агар тэг дар\n"
-"                   сатри фармон дода нашуда бошад вале бе номи қутти).\n"
 
-#: ../urpmf_.c:41
-msgid "  --group        - print tag group: group.\n"
-msgstr " --гурӯҳ          - чопи гурӯҳи тэг: гурӯҳ.\n"
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (ҳ/Н) "
 
-#: ../urpmf_.c:42
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --ҳаҷм          - чопи ҳаҷми тэг: ҳаҷм.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr ""
 
-#: ../urpmf_.c:43
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - чопи epoch тэг: epoch.\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Қуттиҳои зерин имзоҳои бад доранд"
 
-#: ../urpmf_.c:44
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --ҷамъбаст      - чопи ҷамъбасти тэг: ҷамъбаст.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
 
-#: ../urpmf_.c:45
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --тасвирот      - чопи тасвироти тэг: тасвирот.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
 
-#: ../urpmf_.c:46
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr ""
-"  --таъминот      - чопи таъминоти тэг: ҳама таъминот (сатрҳои зиёд).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
 
-#: ../urpmf_.c:47
-msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
 msgstr ""
-" --дархостҳо     - чопи дархостҳои тэг: ҳама дархостҳо (сатрҳои зиёд).\n"
-
-#: ../urpmf_.c:48
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr " --файлҳо        - чопи файлҳои тэг: ҳама файлҳо (сатрҳои зиёд).\n"
+"Барои қаноатмандии тобеиятҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
 
-#: ../urpmf_.c:49
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --зиддиятҳо     - чопи зиддиятҳои тэг: ҳама зиддиятҳо (сатрҳои зиёд).\n"
 
-#: ../urpmf_.c:50
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
-"  --кӯҳнашудаҳо   - чопи кӯҳнашудаҳои тэг: ҳама кӯҳнашудаҳо (сатрҳои зиёд).\n"
+"Қуттиҳои зерин бояд хориҷ карда шаванд ки дигаронаш нав карда шаванд:\n"
+"%s\n"
+"Шумо розӣ ҳастед?"
 
-#: ../urpmf_.c:51
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
+#: ../urpmi:1
+#, c-format
+msgid "unrequested"
+msgstr ""
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmf_.c:53
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - дарбаргирии рамзи perl бевосита ҳамчун perl -e.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to missing %s"
+msgstr ""
 
-#: ../urpmf_.c:54
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+#: ../urpmi:1
+#, c-format
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmf_.c:55
+#: ../urpmi:1
+#, c-format
+msgid "in order to install %s"
+msgstr "барои коргузоштани %s"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
 
-#: ../urpmf_.c:56
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - ягонӣ НЕ, рост агар ифода дурӯғ бошад.\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
 
-#: ../urpmf_.c:57
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - қавси чап барои кушодани ифодаи гурӯҳ.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Интихоби шумо чист? (1-%d) "
 
-#: ../urpmf_.c:58
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - қавси рост барои пӯшидани ифодаи гурӯҳ.\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Яке аз қуттиҳои зерин даркор аст:"
 
-#: ../urpmf_.c:115
+#: ../urpmi:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "One of the following packages is needed to install %s:"
+msgstr "Яке аз қуттиҳои зерин барои коргузории %s даркор аст:"
 
-#: ../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"
-msgstr ""
-"истифода: urpmi.addmedia [хосиятҳо] <ном> <url> [with <relative_path>]\n"
-"дар куҷо <url> яке аз\n"
-"       file://<роҳ>\n"
-"       ftp://<номи дохилӣ>:<гузарвожа>@<соҳиб>/<роҳ> бо <номи нисбии файли "
-"hdlist>\n"
-"       ftp://<соҳиб>/<роҳ> бо <номи нисбии файли hdlist>\n"
-"       http://<соҳиб>/<роҳ> бо <номи нисбии файли hdlist>\n"
-"       хориҷшаванда://<роҳ>\n"
-"\n"
-"ва [хосиятҳо] аз\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Танҳо фавқулкорванд барои коргузоштани қуттиҳо рухсат дорад"
 
-#: ../urpmi.addmedia_.c:54 ../urpmi.update_.c:63 ../urpmi_.c:89 ../urpmq_.c:56
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: ../urpmi:1
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:55 ../urpmi.update_.c:64 ../urpmi_.c:90 ../urpmq_.c:57
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Офридани феҳристи [%s] барои маърӯзаи ғалат номумкин"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../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 ""
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:62
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../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"
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - усули ором.\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
+"  -s             - қуттии оянда қуттии сарчашмавӣ аст (ҳамчун --src).\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - ҷустуҷӯи норӯшан ниҳодан (ҳамчун --fuzzy).\n"
+
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../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"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:75
+#: ../urpmi:1
+#, c-format
 msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - интерфейси X истифода баред.\n"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"%s\n"
-"ҳоҷат нест барои додани <роҳи нисбии hdlist> бо --distrib"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "нав кардани муҳити \"%s\" номумкин\n"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr ""
 
-#: ../urpmi.addmedia_.c:203
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
 msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"%s\n"
-"<роҳи нисбии hdlist> ҳозир нест\n"
 
-#: ../urpmi.addmedia_.c:205
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"%s\n"
-"`with' барои муҳити ftp ҳозир нест\n"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "офаридани муҳити \"%s\" номумкин\n"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr ""
 
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"истифода: urpmi.removemedia [-a] <ном> ...\n"
-"дар куҷо <ном> ин номи муҳит барои хориҷ кардан.\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - интихоби ҳама муҳит.\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
 #, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"ба хориҷкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia истифода баред)\n"
 
-#: ../urpmi.removemedia_.c:50
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"элемент барои хориҷ кардан ҳозир нест\n"
-"(яке аз %s)\n"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
-"истифода: urpmi.removemedia [-a] <ном> ...\n"
-"дар куҷо <ном> ин номи муҳит барои нав кардан.\n"
+"  --noclean      - rpm-и истифода бурда нашударо дар пинҳонӣ нигоҳ доред.\n"
 
-#: ../urpmi.update_.c:70
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - навкунии танҳо муҳити навкунӣ.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - rpm-ро пеш аз ҳама аз пинҳонӣ хориҷ кунед.\n"
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
-"ба навкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia-ро истифода баред)\n"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"элемент барои нав кардан ҳозир нест\n"
-"(яке аз %s)\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi:1
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmi:1
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1071,283 +1367,301 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../urpmi_.c:75
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "нав кардани муҳити \"%s\" номумкин\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "офаридани муҳити \"%s\" номумкин\n"
+
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
+"%s\n"
+"`with' барои муҳити ftp ҳозир нест\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
+"%s\n"
+"<роҳи нисбии hdlist> ҳозир нест\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
+"%s\n"
+"ҳоҷат нест барои додани <роҳи нисбии hdlist> бо --distrib"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "барқароркунии [%s]"
+
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - rpm-ро пеш аз ҳама аз пинҳонӣ хориҷ кунед.\n"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
-"  --noclean      - rpm-и истифода бурда нашударо дар пинҳонӣ нигоҳ доред.\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr ""
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi_.c:86
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi_.c:96
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --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 ""
 
-#: ../urpmi_.c:98
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - интерфейси X истифода баред.\n"
-
-#: ../urpmi_.c:101
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"  --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 ""
 
-#: ../urpmi_.c:103
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi_.c:106
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+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"
 msgstr ""
+"истифода: urpmi.addmedia [хосиятҳо] <ном> <url> [with <relative_path>]\n"
+"дар куҷо <url> яке аз\n"
+"       file://<роҳ>\n"
+"       ftp://<номи дохилӣ>:<гузарвожа>@<соҳиб>/<роҳ> бо <номи нисбии файли "
+"hdlist>\n"
+"       ftp://<соҳиб>/<роҳ> бо <номи нисбии файли hdlist>\n"
+"       http://<соҳиб>/<роҳ> бо <номи нисбии файли hdlist>\n"
+"       хориҷшаванда://<роҳ>\n"
+"\n"
+"ва [хосиятҳо] аз\n"
 
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"элемент барои хориҷ кардан ҳозир нест\n"
+"(яке аз %s)\n"
 
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"ба хориҷкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia истифода баред)\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - ҷустуҷӯи норӯшан ниҳодан (ҳамчун --fuzzy).\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - интихоби ҳама муҳит.\n"
 
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  -s             - қуттии оянда қуттии сарчашмавӣ аст (ҳамчун --src).\n"
-
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - усули ором.\n"
+"истифода: urpmi.removemedia [-a] <ном> ...\n"
+"дар куҷо <ном> ин номи муҳит барои хориҷ кардан.\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"элемент барои нав кардан ҳозир нест\n"
+"(яке аз %s)\n"
 
-#: ../urpmi_.c:114
-msgid "  names or rpm files given on command line will be installed.\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"ба навкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia-ро истифода баред)\n"
 
-#: ../urpmi_.c:197
+#: ../urpmi.update:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi_.c:223
+#: ../urpmi.update:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Офридани феҳристи [%s] барои маърӯзаи ғалат номумкин"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - навкунии танҳо муҳити навкунӣ.\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi.update:1
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"истифода: urpmi.removemedia [-a] <ном> ...\n"
+"дар куҷо <ном> ин номи муҳит барои нав кардан.\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "Танҳо фавқулкорванд барои коргузоштани қуттиҳо рухсат дорад"
-
-#: ../urpmi_.c:349
+#: ../urpmq:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Яке аз қуттиҳои зерин барои коргузории %s даркор аст:"
-
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "Яке аз қуттиҳои зерин даркор аст:"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes танҳо истифода бурда мешавад бо --parallel"
 
-#: ../urpmi_.c:358
+#: ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Интихоби шумо чист? (1-%d) "
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
 
-#: ../urpmi_.c:381
+#: ../urpmq:1
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmi_.c:402
+#: ../urpmq:1
 #, c-format
-msgid "in order to install %s"
-msgstr "барои коргузоштани %s"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - чопи нашр ва нусха ҳамчун бо ном.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmq:1
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - чопи гурӯҳҳо ҳамчун бо ном.\n"
 
-#: ../urpmi_.c:409
+#: ../urpmq:1
 #, c-format
-msgid "due to missing %s"
-msgstr ""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - ҷустуҷӯи баръакс барои қуттии талабшуда.\n"
 
-#: ../urpmi_.c:414
+#: ../urpmq:1
 #, c-format
-msgid "due to conflicts with %s"
-msgstr ""
-
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - ҳосилкунии пурра бо қуттӣ барои хориҷ шудан.\n"
 
-#: ../urpmi_.c:421
+#: ../urpmq:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Қуттиҳои зерин бояд хориҷ карда шаванд ки дигаронаш нав карда шаванд:\n"
-"%s\n"
-"Шумо розӣ ҳастед?"
+"  -u             - хориҷи қуттӣ агар нашри навтарин коргузошта бошад.\n"
 
-#: ../urpmi_.c:457 ../urpmi_.c:466
+#: ../urpmq:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr ""
-"Барои қаноатмандии тобеиятҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - дархости васеъ ба тобеиятҳои қуттӣ.\n"
 
-#: ../urpmi_.c:463
+#: ../urpmq:1
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
-
-#: ../urpmi_.c:495
+#: ../urpmq:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmq:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - рӯйхаткунии тахаллусҳои пареллели дастрас.\n"
 
-#: ../urpmi_.c:507
+#: ../urpmq:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
-
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
-
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "Қуттиҳои зерин имзоҳои бад доранд"
-
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
+"  --list-nodes   - рӯйхаткунии гиреҳҳои дастрас бо истифодаи --parallel.\n"
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (ҳ/Н) "
-
-#: ../urpmi_.c:548
+#: ../urpmq:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "Коргузорӣ нагузашт"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - рӯйхаткунии муҳити дастрас.\n"
 
-#: ../urpmi_.c:572
+#: ../urpmq:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "тақсимкунии %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
-
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н)  "
-
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "ҳамааш аллакай кор гузошта шуд"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - рӯйхаткунии қуттиҳои дастрас.\n"
 
-#: ../urpmq_.c:35
+#: ../urpmq:1
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1364,190 +1678,39 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - рӯйхаткунии қуттиҳои дастрас.\n"
-
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - рӯйхаткунии муҳити дастрас.\n"
-
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
-"  --list-nodes   - рӯйхаткунии гиреҳҳои дастрас бо истифодаи --parallel.\n"
-
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - рӯйхаткунии тахаллусҳои пареллели дастрас.\n"
-
-#: ../urpmq_.c:51
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-
-#: ../urpmq_.c:53
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - дархости васеъ ба тобеиятҳои қуттӣ.\n"
-
-#: ../urpmq_.c:64
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - хориҷи қуттӣ агар нашри навтарин коргузошта бошад.\n"
-
-#: ../urpmq_.c:65
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - ҳосилкунии пурра бо қуттӣ барои хориҷ шудан.\n"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - ҷустуҷӯи баръакс барои қуттии талабшуда.\n"
-
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - чопи гурӯҳҳо ҳамчун бо ном.\n"
-
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - чопи нашр ва нусха ҳамчун бо ном.\n"
-
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: ../urpmq_.c:174
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes танҳо истифода бурда мешавад бо --parallel"
-
-#: placeholder.h:18
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "нашри urpmf %s"
-
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Ҳуқуқи муаллифӣ (С) 1999,2000,2001,2002 MandrakeSoft"
-
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr ""
-"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
-"шавад."
-
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "истифода: urpmf [хосиятҳо] <файл>"
-
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr ""
-"  --хомӯш         - номи тэгро чоп накунед (пешфарз агар ягон тэг дар фармон "
-"набошад"
-
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "\t\t\t    сатр, номувофиқ аст бо усули интерактивӣ)."
-
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr " --ҳама      \t  - чопи ҳама тэгҳо."
+msgid "Installation failed on node %s"
+msgstr "Коргузорӣ дар гиреҳи %s нагузашт"
 
-#: placeholder.h:25
-msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
 msgstr ""
-"  --ном           - чопи номи тэг: номи файли rpm (қабул шуд агар тэг дода "
-"нашуда бошад"
-
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    сатри фармон вале бе номи қутти)."
-
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr " --гурӯҳ          - чопи гурӯҳи тэг: гурӯҳ."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr "  --ҳаҷм          - чопи ҳаҷми тэг: ҳаҷм."
-
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --силсила       - чопи силсилаи тэг: силсила."
-
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --ҷамъбаст      - чопи ҷамъбасти тэг: ҷамъбаст."
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr "  --тасвирот      - чопи тасвироти тэг: тасвирот."
-
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --таъминот      - чопи таъминоти тэг: ҳама таъминот (сатрҳои зиёд)."
-
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr " --дархостҳо     - чопи дархостҳои тэг: ҳама дархостҳо (сатрҳои зиёд)."
-
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr " --файлҳо        - чопи файлҳои тэг: ҳама файлҳо (сатрҳои зиёд)."
-
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
 msgstr ""
-"  --зиддиятҳо     - чопи зиддиятҳои тэг: ҳама зиддиятҳо (сатрҳои зиёд)."
 
-#: placeholder.h:36
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
 msgstr ""
-"  --кӯҳнашудаҳо   - чопи кӯҳнашудаҳои тэг: ҳама кӯҳнашудаҳо (сатрҳои зиёд)."
-
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr " --заминаҳо      - чопи заминаҳои тэг: ҳама заминаҳо (сатрҳои зиёд)."
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "барои интихоби зиёдтар urpmf --help-ро интихоб кунед"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "scp failed on host %s"
+msgstr "scp дар хидматгори %s нагузашт"
 
-#: placeholder.h:40
-msgid "no full media list was found"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
 msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "хатогии таркибӣ дар сатри %s дар файли танзимдарор"
-
-#, fuzzy
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr ""
-#~ "муҳити \"%s\"кӯшиш мекунад, ки hdlist-и истифодашударо истифода барад,"
-#~ "муҳит рад шуд"
-
 #~ msgid "nothing to write in list file for \"%s\""
 #~ msgstr "дар файли рӯйхат барои \"%s\" чизе ба навиштан нест"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
-
 #~ msgid "urpmi is not installed"
 #~ msgstr "urpmi кор нагузоштааст"
 
diff --git a/po/th.po b/po/th.po
index 44580d00..91e0f230 100644
--- a/po/th.po
+++ b/po/th.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: 2002-11-25 13:52-0500\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -14,1126 +14,1222 @@ 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\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 "Yy�"
 
-#: ../_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 "Nn�"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf ������� %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
+
+#: placeholder.h:20
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"��õԴ��� Package Ẻ�ѵ��ѵ...\n"
-"�س�����͡���еԴ��� Package %s\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
+msgstr "���������� �������öᨡ��������������͹� GNUGPL."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "��ŧ�����Ѻ"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "�����ҹ:urpmf [options] <file>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "��ŧ"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr " --quiet        - ����ͧ�������� Tag (default ��� tag �����١�к�� command"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "¡��ԡ"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                  line,�������Ѻ���� interactive). "
 
-#: ../_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 "Nn�"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr " --all          - ����� tag ������"
 
-#: ../_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 "Yy�"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr " --name         - �������� tag:  ������� rpm (���ص��� tag �����١�к��"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (Y/n) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                  command line ������ժ��� package)"
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr " --group        - ����� tag group: group."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr " --size         - ����좹Ҵ tag:��Ҵ"
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr " --serial       - ����� tag serial: serial"
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr " --summary      - ����� tag summary: summary"
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr " --description  - ����� tag ��������´  : ��������´"
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr " --provides     -�����  tag provides: all provides (���º�÷Ѵ). "
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr " --requires     - �����  tag ����ͧ���:����ͧ��÷�����(���º�÷Ѵ)."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr " --files        - �����  tag files: file ������ (���º�÷Ѵ)."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr " --conflicts    -����� tag �����ҡѹ�����:��ҡѹ����������(���º�÷Ѵ)."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr " --obsoletes    -����� tag ���������:������������(���º�÷Ѵ)."
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+" --prereqa      - ����� tag ��觷����繵�ͧ�ӡ�͹: ��觷����繵�ͧ�ӡ�͹������(���º�÷Ѵ)."
 
-#: ../_irpm_.c:63
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "try urpmf --help �շҧ����������͡�ҡ"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "��辺��¡������Ѻ�����"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: ��辺����觹��\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "webfetch %s ������ѡ !!!\n"
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "������ѡ��ⵤ�ŷ���к����%s"
+msgid "Cancel"
+msgstr "¡��ԡ"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "��辺 webfetch (curl ���� wget 㹢�й��)\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "��ŧ"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "�������ö��ҹ��ⵤ��: %s"
+msgid "Is this OK?"
+msgstr "��ŧ�����Ѻ"
+
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"��õԴ��� Package Ẻ�ѵ��ѵ...\n"
+"�س�����͡���еԴ��� Package %s\n"
 
-#: ../urpm.pm_.c:246
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "���ѧ�Դ��� %s\n"
+
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...��äѴ�͡�������"
+msgid "unable to open rpmdb"
+msgstr "�������öŧ����¹ rpm file"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget ����\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "�������ö��ҹ rpm file [%s]"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget �������: �͡�ҡ�к����� %d ���ʹ����ѭ�ҳ %d\n"
+msgid "%s conflicts with %s"
+msgstr "%s �Ѵ��駡Ѻ %s"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl ����\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "%s is needed by %s"
+msgstr "%s ��������Ѻ %s"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "�ػ�ó�\"%s\"���������͡���ػ�ó���������, �ػ�ó�١¡��ԡ�����"
+msgid "unable to install package %s"
+msgstr "�������ö�Դ�����ࡨ %s"
 
-#: ../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 "�������ö�����ػ�ó�\"%s\"������� list file ��١�����ػ�ó��������"
+msgid "unable to remove package %s"
+msgstr "�������ö����ź��ࡨ %s"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "�������ö����� \"%s\" ����Ѻ�ػ�ó�������ժ�����������ѹ��١������"
+msgid "Preparing..."
+msgstr "���ѧ�����..."
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "�������ö���ػ�ó� \"%s\" ���������������� list file[%s]"
+msgid "...retrieving failed: %s"
+msgstr "�����ҹ�������������: %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "�������ö��˹��ػ�ó���� hdlist file ��� [%s]"
+msgid "...retrieving done"
+msgstr "�����ҹ���������º����"
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "���ѧ��ҹ��������� rpm..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "�������ö��ҹ hdlist file \"%s\", medium ignored"
+msgid "malformed input: [%s]"
+msgstr " input���١��ͧ :[%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "�������ö��ҹ list file �ͧ \"%s\", medium ignored"
+msgid "unable to access medium \"%s\""
+msgstr "�������ö���ػ�ó�\"%s\""
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "���ѧ����§��÷ӧҹ�ͧ�ػ�ó� \"%s\""
+msgid "urpmi database locked"
+msgstr "�ҹ������ urpmi �١��͡"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "�������ö�� hdlist file ����Ѻ\"%s\",medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "�ػ�ó������������ѹ \"%s\" �١�к���Ҷʹ����¹�����ѹ�����"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "�������ö�� list file ����Ѻ\"%s\",medium ignored"
+msgid "medium \"%s\" is not selected"
+msgstr "�ػ�ó� \"%s\" �����١���͡"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "list file ���еԴ�е�� \"%s\", medium ignored"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "�������ö��ҹ rpm file [%s] �ҡ \"%s\""
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "�������ö��Ǩ�ͺ list file ����Ѻ \"%s\", medium ignored"
+msgid "package %s is not found."
+msgstr "�� %s package ��辺"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "�ӹǹ���ҷ���·��ҡ�Թ�����Ѻ�ػ�ó�Ẻ����͹������\"%s\""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "���ѧ���ػ�ó�������͹������ҡ \"%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:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "���ػ�ó�Ẻ��������͡����ᵡ��ҧ [%s] ����Ѻ \"%s\""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "������ package ����ժ����������͹�Ѻ \"%s\""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "������Ҷ�д֧��ǹ�ͧ pathname ����Ѻ�ػ�ó�Ẻ����͹������\"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "�������ö���м�ҹ [%s] ���¤�� \"%s\"���ҧ�١��ͧ"
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "�������ö��¹ config file [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "packages ���仹���� %s: %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "��¹ config file[%s]"
+msgid "no package named %s"
+msgstr "����� package ������ %s"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "�������ö��ҹ \"%s\" � file [%s]"
+msgid "error registering local packages"
+msgstr "ŧ����¹ local package �բ�ͼԴ��Ҵ"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "�������ö��ҹ rpm file [%s]"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "���ѧ��ҹ��������� rpm..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "���ѧ��Ǩ�ͺ parallel handler ���� [%s]"
+msgid "invalid rpm file name [%s]"
+msgstr "���� rpm file���١��ͧ [%s]"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "�� parallel handler ����Ѻ %s"
+msgid "no entries relocated in depslist"
+msgstr "����դ�ҫ�觶١����� depslist"
 
-#: ../urpm.pm_.c:780
-#, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "���ѧ���ػ�ó�������Ǣ�ͧ����Ѻ parallel mode : %s "
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "���� %s � depslist"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "�������ö�� parallel option \"%s\""
+msgid "unmounting %s"
+msgstr "���ѧ�ʹ�͹ %s"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis cannot be used with --media, --update or --parallel"
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "���ѧ�Դ��� %s"
 
-#: ../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 "removing %d obsolete headers in cache"
+msgstr "���ѧź %d header����������� cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "�� %d header � cache"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "���ҧ hdlist synthesis file ����Ѻ �ػ�ó� \"%s\""
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "���ѧ��Ǩ�ͺ��� hdlist [%s]"
 
-#: ../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]"
 msgstr "���ѧ��Ǩ�ͺ��� synthesis [%s]"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "�ջѭ��㹡�����ҧ��� hdlist ����Ѻ�ػ�ó�\"%s\""
+msgid "building hdlist [%s]"
+msgstr "���ҧ hdlist [%s]"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "���ѧ�ӡ����ҹ headers �ҡ�ػ�ó�\"%s\""
+
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "�ӡ�ü�ҹ���駷���ͧ���ͷ��ͺ �����������\n"
 
-#: ../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\""
 msgstr "�ջѭ��㹡����ҹ��� synthesis ����Ѻ�ػ�ó�\"%s\""
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-#, fuzzy
-msgid "unable to open rpmdb"
-msgstr "�������öŧ����¹ rpm file"
-
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "�ػ�ó�\"%s\"����������"
+msgid "nothing written in list file for \"%s\""
+msgstr "����ա����¹� list file ����Ѻ\"%s\""
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "�ػ�ó���١��������� %s"
+msgid "writing list file for medium \"%s\""
+msgstr "���ѧ��¹ list file ����Ѻ�ػ�ó�\"%s\""
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "�������ö��Ҷ֧�ػ�ó�������㹡�õԴ����ѹ�á"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "�������ö��¹ list file �ͧ\"%s\""
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "���ѧ�Ѵ�͡��� hdlist"
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "��� [%s] ����ҹ����㹷�����ǡѹ��������\"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "��äѴ�͡����ó�"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "�������ö parse hdlist file of \"%s\""
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "��äѴ�͡����ó�"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "��辺 hdlist file ����Ѻ�ػ�ó�\"%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)"
-msgstr "�������ö������Ҷ֧�ػ�ó����͡�õԴ��駵���á (��辺��� Mandrake/base/hdlists)"
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "��ô֧�鴨ҡ hdlist (���� synthesis)�������"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "���ѧ��ҹ�����Ũҡ��� hdlists"
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "���ѧ��Ǩ�ͺ��� MD5SUM"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "�����ҹ���������º����"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "���ѧ�Ѵ�͡�� hdlist (���� synthesis) �ͧ \"%s\"..."
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "�����ҹ�������������: %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "���ѧ�֧�� hdlist (���� synthesis) �ͧ \"%s\"..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "��͸Ժ�� hdlist ���١��ͧ \"%s\" ���� hdlists"
+msgid "retrieving description file of \"%s\"..."
+msgstr "���ѧ��ҹ��͸Ժ�����ͧ \"%s\"..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "�������������͡���ػ�ó��������\"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "��辺 rpm files �ҡ [%s]"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "�������ö��ҹ��� rpm �ҡ [%s]: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "�������������͡��������������: %s"
+msgid "reading rpm files from [%s]"
+msgstr "���ѧ��ҹ��� rpm �ҡ [%s]"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "���ѧ�ӡ�������͡�ػ�ó�\"%s\""
+msgid "...copying done"
+msgstr "��äѴ�͡����ó�"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "�ҹ������ urpmi �١��͡"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "��äѴ�͡����ó�"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "�������ö���ػ�ó�\"%s\""
+msgid "copying source list of \"%s\"..."
+msgstr "���ѧ�Ѵ�͡��¡���鴢ͧ \"%s\""
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "���ѧ�Ѵ�͡��͸Ժ�����ͧ \"%s\"..."
+msgid "copy of [%s] failed"
+msgstr "��÷����� [%s] ��������"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "���ѧ�Ѵ�͡�� hdlist (���� synthesis) �ͧ \"%s\"..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "��÷����� [%s] ��������"
+msgid "copying description file of \"%s\"..."
+msgstr "���ѧ�Ѵ�͡��͸Ժ�����ͧ \"%s\"..."
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "���ѧ��Ǩ�ͺ��� MD5SUM"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "���ѧ�ӡ�������͡�ػ�ó�\"%s\""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "���ѧ�Ѵ�͡��¡���鴢ͧ \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "�������������͡��������������: %s"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "���ѧ��ҹ��� rpm �ҡ [%s]"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "�������ö��ҹ��� rpm �ҡ [%s]: %s"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "�������������͡���ػ�ó��������\"%s\""
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "��辺 rpm files �ҡ [%s]"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "�������ö������Ҷ֧�ػ�ó����͡�õԴ��駵���á (��辺��� Mandrake/base/hdlists)"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "���ѧ��ҹ��͸Ժ�����ͧ \"%s\"..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "��͸Ժ�� hdlist ���١��ͧ \"%s\" ���� hdlists"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "���ѧ�֧�� hdlist (���� synthesis) �ͧ \"%s\"..."
+msgid "retrieving hdlists file..."
+msgstr "���ѧ��ҹ�����Ũҡ��� hdlists"
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "��ô֧�鴨ҡ hdlist (���� synthesis)�������"
+#: ../urpm.pm:1
+#, c-format
+msgid "copying hdlists file..."
+msgstr "���ѧ�Ѵ�͡��� hdlist"
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "��辺 hdlist file ����Ѻ�ػ�ó�\"%s\""
+msgid "unable to access first installation medium"
+msgstr "�������ö��Ҷ֧�ػ�ó�������㹡�õԴ����ѹ�á"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "��� [%s] ����ҹ����㹷�����ǡѹ��������\"%s\""
+msgid "added medium %s"
+msgstr "�ػ�ó���١��������� %s"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "�������ö parse hdlist file of \"%s\""
+msgid "medium \"%s\" already exists"
+msgstr "�ػ�ó�\"%s\"����������"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "�������ö��¹ list file �ͧ\"%s\""
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "�ջѭ��㹡�����ҧ��� hdlist ����Ѻ�ػ�ó�\"%s\""
 
-#: ../urpm.pm_.c:1526
+#: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "���ѧ��¹ list file ����Ѻ�ػ�ó�\"%s\""
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis cannot be used with --media, --update or --parallel"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "����ա����¹� list file ����Ѻ\"%s\""
+msgid "unable to use parallel option \"%s\""
+msgstr "�������ö�� parallel option \"%s\""
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "�ӡ�ü�ҹ���駷���ͧ���ͷ��ͺ �����������\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "���ѧ���ػ�ó�������Ǣ�ͧ����Ѻ parallel mode : %s "
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "���ѧ�ӡ����ҹ headers �ҡ�ػ�ó�\"%s\""
+msgid "found parallel handler for nodes: %s"
+msgstr "�� parallel handler ����Ѻ %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "���ҧ hdlist [%s]"
+msgid "examining parallel handler in file [%s]"
+msgstr "���ѧ��Ǩ�ͺ parallel handler ���� [%s]"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "���ҧ hdlist synthesis file ����Ѻ �ػ�ó� \"%s\""
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "�������ö��ҹ \"%s\" � file [%s]"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "�� %d header � cache"
+msgid "write config file [%s]"
+msgstr "��¹ config file[%s]"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "���ѧź %d header����������� cache"
+msgid "unable to write config file [%s]"
+msgstr "�������ö��¹ config file [%s]"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "���ѧ�Դ��� %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "������Ҷ�д֧��ǹ�ͧ pathname ����Ѻ�ػ�ó�Ẻ����͹������\"%s\""
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "���ѧ�ʹ�͹ %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "���ػ�ó�Ẻ��������͡����ᵡ��ҧ [%s] ����Ѻ \"%s\""
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "���� %s � depslist"
-
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "����դ�ҫ�觶١����� depslist"
+msgid "taking removable device as \"%s\""
+msgstr "���ѧ���ػ�ó�������͹������ҡ \"%s\" �͡��"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "���� rpm file���١��ͧ [%s]"
-
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "���ѧ��ҹ��������� rpm..."
+msgid "too many mount points for removable medium \"%s\""
+msgstr "�ӹǹ���ҷ���·��ҡ�Թ�����Ѻ�ػ�ó�Ẻ����͹������\"%s\""
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "�������ö��ҹ rpm file [%s]"
-
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "�������ö��ҹ rpm file [%s]"
-
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "ŧ����¹ local package �բ�ͼԴ��Ҵ"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "�������ö��Ǩ�ͺ list file ����Ѻ \"%s\", medium ignored"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "����� package ������ %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "list file ���еԴ�е�� \"%s\", medium ignored"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "packages ���仹���� %s: %s"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "�������ö�� list file ����Ѻ\"%s\",medium ignored"
 
-#: ../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\""
-msgstr "������ package ����ժ����������͹�Ѻ \"%s\""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "�������ö�� hdlist file ����Ѻ\"%s\",medium ignored"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "�������ö���м�ҹ [%s] ���¤�� \"%s\"���ҧ�١��ͧ"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "���ѧ����§��÷ӧҹ�ͧ�ػ�ó� \"%s\""
 
-#: ../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)"
-msgstr ""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "�������ö��ҹ list file �ͧ \"%s\", medium ignored"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "�������ö��ҹ hdlist file \"%s\", medium ignored"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "�� %s package ��辺"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "�������ö��˹��ػ�ó���� hdlist file ��� [%s]"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "�ػ�ó� \"%s\" �����١���͡"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "�������ö���ػ�ó� \"%s\" ���������������� list file[%s]"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "�������ö��ҹ rpm file [%s] �ҡ \"%s\""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "�������ö����� \"%s\" ����Ѻ�ػ�ó�������ժ�����������ѹ��١������"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "�ػ�ó������������ѹ \"%s\" �١�к���Ҷʹ����¹�����ѹ�����"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "�������ö�����ػ�ó�\"%s\"������� list file ��١�����ػ�ó��������"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr " input���١��ͧ :[%s]"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "�ػ�ó�\"%s\"���������͡���ػ�ó���������, �ػ�ó�١¡��ԡ�����"
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "���ѧ��ҹ��������� rpm..."
+#: ../urpm.pm:1
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "�ػ�ó�\"%s\"��������� hdlist������������� ,�ػ�ó�١¡��ԡ�����"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "���ѧ�����..."
+#: ../urpm.pm:1
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "�բ�ͼԴ��Ҵ� config file ��÷Ѵ��� %s"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "�������ö����ź��ࡨ %s"
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "�������ö�Դ�����ࡨ %s"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s ��������Ѻ %s"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync ��������͡�ҡ�к����� %d ���ʹ����ѭ�ҳ %d\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �Ѵ��駡Ѻ %s"
+msgid "ssh is missing\n"
+msgstr "ssh ���������\n"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync is missing\n"
+msgstr "rsync ����\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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl ��������͡���� %d ���ʹ����ѭ�ҳ %d\n"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "curl is missing\n"
+msgstr "curl ����\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 "��õԴ��駺� %s ��������"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget �������: �͡�ҡ�к����� %d ���ʹ����ѭ�ҳ %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 "��õԴ�������ö����"
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr "wget ����\n"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
-#: ../urpm/parallel_ssh.pm_.c:185
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "��õԴ��駺� %s ��������"
+msgid "copy failed: %s"
+msgstr "...��äѴ�͡�������"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpm.pm:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "����ͧ %s ����� urpmi ���١��ͧ"
+msgid "unable to handle protocol: %s"
+msgstr "�������ö��ҹ��ⵤ��: %s"
 
-#: ../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 ""
-"����� urpmi ������� %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 "no webfetch (curl or wget currently) found\n"
+msgstr "��辺 webfetch (curl ���� wget 㹢�й��)\n"
 
-#: ../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         - ������ͤ�������\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "������ѡ��ⵤ�ŷ���к����%s"
 
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --�ѵ��ѵ�         - �ӡ�����͡��ࡨ���ѵ��ѵ�.\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "webfetch %s ������ѡ !!!\n"
 
-#: ../urpme_.c:46 ../urpmi_.c:105
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "...��äѴ�͡�������"
+
+#: ../urpme:1
+#, c-format
 msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - ��Ǩ�ͺ��ҡ�õԴ�������ö����١��ͧ�������.\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "���ͤ����١��ͧ�ͧ���������������ҧ�������ࡨ�ҧ��Ǩж١ź���(%d MB)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - distributed urpmi accross machines of alias.\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "˹��� Packages ���仹���ͧ���Ѻ��õԴ��� "
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - ���͡���������ç�Ѻ�����\n"
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "��������÷���ͧź���\n"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ������͡������ѡ \"-%s\" ��Ǩ�ͺ�����ҡ --help\n"
+msgid "removing package %s will break your system"
+msgstr "��ࡨ %s �����ѧź����з�����к����������\n"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown package"
 msgstr "��ࡨ������ѡ"
 
-#: ../urpme_.c:83
-#, fuzzy
+#: ../urpme:1
+#, fuzzy, c-format
 msgid "unknown packages"
 msgstr "��ࡨ������ѡ"
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "��ࡨ %s �����ѧź����з�����к����������\n"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ������͡������ѡ \"-%s\" ��Ǩ�ͺ�����ҡ --help\n"
 
-#: ../urpme_.c:95
-#, fuzzy
-msgid "Nothing to remove"
-msgstr "��������÷���ͧź���\n"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - ���͡���������ç�Ѻ�����\n"
 
-#: ../urpme_.c:98
-#, fuzzy
-msgid "Checking to remove the following packages"
-msgstr "˹��� Packages ���仹���ͧ���Ѻ��õԴ��� "
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - distributed urpmi accross machines of alias.\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 "���ͤ����١��ͧ�ͧ���������������ҧ�������ࡨ�ҧ��Ǩж١ź���(%d MB)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - ��Ǩ�ͺ��ҡ�õԴ�������ö����١��ͧ�������.\n"
 
-#: ../urpme_.c:113
-#, fuzzy
-msgid "Removing failed"
-msgstr "...��äѴ�͡�������"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --�ѵ��ѵ�         - �ӡ�����͡��ࡨ���ѵ��ѵ�.\n"
 
-#: ../urpmf_.c:26
-#, fuzzy, c-format
+#: ../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         - ������ͤ�������\n"
+
+#: ../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 ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"����� urpmi ������� %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"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - �������Ѿവ�����\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - ���͡��੾������·��١��鹴�������ͧ�����١���\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - ���͡���������ç�Ѻ�����\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - ���͡���������ç�Ѻ�����\n"
 
-#: ../urpmf_.c:35
-#, fuzzy
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - ������\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  -u             - ź��ࡨ�����ࡨ���ա����ա�õԴ�����������.\n"
 
-#: ../urpmf_.c:36
-#, fuzzy
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr " --quiet        - ����ͧ�������� Tag (default ��� tag �����١�к�� command"
-
-#: ../urpmf_.c:38
-#, fuzzy
-msgid "  --all          - print all tags.\n"
-msgstr " --all          - ����� tag ������"
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
 
-#: ../urpmf_.c:39
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
-"                   command line but without package name).\n"
-msgstr " --name         - �������� tag:  ������� rpm (���ص��� tag �����١�к��"
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr "  -u             - ź��ࡨ�����ࡨ���ա����ա�õԴ�����������.\n"
 
-#: ../urpmf_.c:41
-#, fuzzy
-msgid "  --group        - print tag group: group.\n"
-msgstr " --group        - ����� tag group: group."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - �Ӥ������Ҵ��ǹ headers �ͧ���礵���� cache \n"
 
-#: ../urpmf_.c:42
-#, fuzzy
-msgid "  --size         - print tag size: size.\n"
-msgstr " --size         - ����좹Ҵ tag:��Ҵ"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - ������蹷������, �������� arch ���������.\n"
 
-#: ../urpmf_.c:43
-#, fuzzy
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr " --size         - ����좹Ҵ tag:��Ҵ"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - �ѧ�Ѻ������ҧ��� hdlist\n"
 
-#: ../urpmf_.c:44
-#, fuzzy
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr " --summary      - ����� tag summary: summary"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes    -����� tag ���������:������������(���º�÷Ѵ)."
 
-#: ../urpmf_.c:45
-#, fuzzy
-msgid "  --description  - print tag description: description.\n"
-msgstr " --description  - ����� tag ��������´  : ��������´"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid ""
+"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts    -����� tag �����ҡѹ�����:��ҡѹ����������(���º�÷Ѵ)."
 
-#: ../urpmf_.c:46
-#, fuzzy
-msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr " --provides     -�����  tag provides: all provides (���º�÷Ѵ). "
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files (multiple lines).\n"
+msgstr " --files        - �����  tag files: file ������ (���º�÷Ѵ)."
 
-#: ../urpmf_.c:47
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
 msgstr " --requires     - �����  tag ����ͧ���:����ͧ��÷�����(���º�÷Ѵ)."
 
-#: ../urpmf_.c:48
-#, fuzzy
-msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr " --files        - �����  tag files: file ������ (���º�÷Ѵ)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides     -�����  tag provides: all provides (���º�÷Ѵ). "
 
-#: ../urpmf_.c:49
-#, fuzzy
-msgid ""
-"  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr " --conflicts    -����� tag �����ҡѹ�����:��ҡѹ����������(���º�÷Ѵ)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr " --description  - ����� tag ��������´  : ��������´"
 
-#: ../urpmf_.c:50
-#, fuzzy
-msgid ""
-"  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr " --obsoletes    -����� tag ���������:������������(���º�÷Ѵ)."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr " --summary      - ����� tag summary: summary"
 
-#: ../urpmf_.c:51
-#, fuzzy
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - �ѧ�Ѻ������ҧ��� hdlist\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr " --size         - ����좹Ҵ tag:��Ҵ"
 
-#: ../urpmf_.c:52 ../urpmq_.c:72
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - ������蹷������, �������� arch ���������.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr " --size         - ����좹Ҵ tag:��Ҵ"
 
-#: ../urpmf_.c:53
-#, fuzzy
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - �Ӥ������Ҵ��ǹ headers �ͧ���礵���� cache \n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr " --group        - ����� tag group: group."
 
-#: ../urpmf_.c:54
-#, fuzzy
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -u             - ź��ࡨ�����ࡨ���ա����ա�õԴ�����������.\n"
+"  --name         - print tag name: rpm filename (assumed if no tag given on\n"
+"                   command line but without package name).\n"
+msgstr " --name         - �������� tag:  ������� rpm (���ص��� tag �����١�к��"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr " --all          - ����� tag ������"
 
-#: ../urpmf_.c:55
+#: ../urpmf:1
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr " --quiet        - ����ͧ�������� Tag (default ��� tag �����١�к�� command"
 
-#: ../urpmf_.c:56
-#, fuzzy
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  -u             - ź��ࡨ�����ࡨ���ա����ա�õԴ�����������.\n"
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - ������\n"
 
-#: ../urpmf_.c:57
-#, fuzzy
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - ���͡���������ç�Ѻ�����\n"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#: ../urpmf_.c:58
-#, fuzzy
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - ���͡���������ç�Ѻ�����\n"
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - ���͡��੾������·��١��鹴�������ͧ�����١���\n"
 
-#: ../urpmf_.c:115
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - �������Ѿവ�����\n"
 
-#: ../urpmi.addmedia_.c:44
+#: ../urpmf:1
+#, fuzzy, c-format
 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"
+"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"
-"and [options] are from\n"
+"usage:\n"
 msgstr ""
-"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"
+"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"
-"and [options] are from\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 ���ʹ֧�����������¹͡\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 ���ʹ֧�����������¹͡\n"
+"usage:\n"
 
-#: ../urpmi.addmedia_.c:56 ../urpmi.update_.c:65 ../urpmi_.c:91
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Everything already installed"
+msgstr "�ء���ҧ��١�Դ������º��������"
 
-#: ../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        - ��㹡�á�˹����͡��� HTTP �����Ţ�������ص���\n"
-"                    1080(�ٻẺ��� <proxyhost[:port]>)\n"
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation is possible"
+msgstr "��õԴ�������ö����"
 
-#: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - ��˹����ͼ����������ʼ�ҹ��������͡���\n"
-"                   㹡�õ�Ǩ�ͺ (�ٻẺ�� <user:password>)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Installation failed"
+msgstr "��õԴ�����������"
 
-#: ../urpmi.addmedia_.c:61
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - ���ҧ�ػ�ó����͡���Ѿവ\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "��ͧ��÷��ͧ�ѧ�Ѻ�Դ��� (--force)? (y/N)"
 
-#: ../urpmi.addmedia_.c:62
-#, fuzzy
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr "  --distrib      - �ӡ�����ҧ����¨ҡ�ػ�ó�����Ѻ�Դ������ѵ��ѵ�\n"
+#: ../urpmi:1
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "��ͧ��÷��ͧ�Դ����·������ͧ��ͨ�ͺ������ҡѹ��? (y/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 ""
+#: ../urpmi:1
+#, c-format
+msgid "distributing %s\n"
+msgstr "���ѧᨡ���� %s\n"
 
-#: ../urpmi.addmedia_.c:67
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --env          - ��������͹��繷�Ẻ੾��(�·������Ѻ�����§ҹ\n"
-"                   �ѡ).\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"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"��õԴ�����������պҧ�����Ҵ����\n"
+"���й����ӡ���Ѿവ�ҹ������ urpmi"
 
-#: ../urpmi.addmedia_.c:72
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpmi.addmedia_.c:74 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:72
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - �Ӥ������Ҵ��ǹ headers �ͧ���礵���� cache \n"
+#: ../urpmi:1
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "�س�ѧ��ͧ��èеԴ����ա����������� ?"
 
-#: ../urpmi.addmedia_.c:75
-#, fuzzy
-msgid ""
-"  -h             - try to find and use synthesis or hdlist\n"
-"                   file.\n"
-msgstr "  -h             - ������������������ synthesis ���� hdlist\n"
+#: ../urpmi:1
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "��ࡨ���仹���� signatures ������١��ͧ"
 
-#: ../urpmi.addmedia_.c:77 ../urpmi.update_.c:74
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - �ѧ�Ѻ������ҧ��� hdlist\n"
+#: ../urpmi:1
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "��سҡ� enter ����;����"
 
-#: ../urpmi.addmedia_.c:145
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "��س�����ػ�ó����ժ��� \"%s\" � [%s]"
 
-#: ../urpmi.addmedia_.c:185
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"�����繨е�ͧ��� <relative path �ͧ hdlist>�Ѻ -distrib"
+msgid "unable to get source packages, aborting"
+msgstr "�������ö���¡ source package,���ѧ¡��ԡ"
 
-#: ../urpmi.addmedia_.c:192 ../urpmi.addmedia_.c:215
+#: ../urpmi:1
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "�������ö����ػ�ó�\"%s\"\n"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "���ͷ�����㢻ѭ�ҡ����ҡѹ�� packages ���仹��ж١�Դ��� (%d MB)"
 
-#: ../urpmi.addmedia_.c:203
+#: ../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 ""
+"�س�е�ͧ���ٷ㹡�õԴ��� ����������� :\n"
 "%s\n"
-"��辺<���ҧ�������Ǣ�ͧ�ͧhdlist>\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 ""
+"��ࡨ���仹��е�ͧ�١ź������ͨзӡ���Ѿ�ô���������:\n"
 "%s\n"
-" `with' ��辺����Ѻ�ػ�ó� ftp\n"
+"�س������ӡ��ź����������?"
 
-#: ../urpmi.addmedia_.c:213
+#: ../urpmi:1
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "�������ö���ҧ�ػ�ó� \"%s\"\n"
-
-#: ../urpmi.removemedia_.c:34
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "unrequested"
 msgstr ""
-"�����: urpmi.removemedia [-a] <name> ...\n"
-"㹢�з�� <name> �繪��ͧ͢�ػ�ó����ͧ�������͡\n"
 
-#: ../urpmi.removemedia_.c:37
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - ���͡����·�����\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "%s �Ѵ��駡Ѻ %s"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:75
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "wget ����\n"
+
+#: ../urpmi:1
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"\n"
-"�ҧ���͡������ѡ '%s'\n"
 
-#: ../urpmi.removemedia_.c:48
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "��������÷�������͡(�� urpmi.addmedia ���������ػ�ó�)\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "�������ö�Դ�����ࡨ %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 ""
-"����բ����ŷ��зӡ������͡\n"
-"(˹��� %s)\n"
+"��ࡨ����˹����ҧ����������ö�Դ�����:\n"
+"%s\n"
+"�س��繴����������?"
 
-#: ../urpmi.update_.c:60
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"�����: urpmi.update [options] <name> ...\n"
-"�·�� <name> �繪��ͧ͢�ػ�ó����ͧ����Ѿവ\n"
+#: ../urpmi:1
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "������͡���١��ͧ �ͧ�����Ѻ\n"
 
-#: ../urpmi.update_.c:70
-#, fuzzy
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - �������Ѿവ�����\n"
+#: ../urpmi:1
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "��ͧ������͡���ä�Ѻ  (1-%d) "
 
-#: ../urpmi.update_.c:71
-msgid "  -a             - select all non-removable media.\n"
-msgstr " --a          - ���͡����·���������ö����͹����������� \n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "˹��� Packages ���仹���ͧ���Ѻ��õԴ��� "
 
-#: ../urpmi.update_.c:73
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "  -d             - �ѧ�Ѻ����ա�äӹdz�������´�ͧ��� depslist.ordered\n"
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "˹��� Packages ���仹���ͧ��㹡�èеԴ��� %s:"
 
-#: ../urpmi.update_.c:85
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "����ա�����(use urpmi.addmedia ���������ػ�ó�)\n"
+#: ../urpmi:1
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "superuser ��ҹ�鹷�����Է�ԵԴ��� packages"
 
-#: ../urpmi.update_.c:97
+#: ../urpmi:1
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr "�Ҵ�����ŷ��й�� update(˹��� %s)\n"
+msgid "using specific environment on %s\n"
+msgstr ""
 
-#: ../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 "�������ö���ҧ���礵���� [%s] ����Ѻ��§ҹ�ѡ"
+
+#: ../urpmi:1
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"����� urpmi ������� %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"
 
-#: ../urpmi_.c:75
-#, fuzzy
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#: ../urpmi:1
+#, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: ������͡������ѡ \"-%s\" ��Ǩ�ͺ�����ҡ --help\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:44
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --���͡�ѵ��ѵ�  - ���͡��ࡨ����ͧ����Ѿ�ô�ѵ��ѵ�\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "����駾��͡���������\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:45
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - ����Ẻ�����Ш�(�����ǡѺ -y).\n"
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "����������ͪ��� rpm ���������㹤���觶١�Դ�������\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:50
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - ��ࡨ��������ǹ�ͧ�� (�����ǡѺ -s).\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - ������\n"
 
-#: ../urpmi_.c:80
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+#: ../urpmi:1
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - ������º\n"
 
-#: ../urpmi_.c:81
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - remove rpm from cache before anything else.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - ��ࡨ��������ࡨ�� (�����ǡѺ --src).\n"
 
-#: ../urpmi_.c:82
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - �� rpm ������١��� cache.\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - ���ä���Ẻ�����Ш�(�����ǡѺ����� --fuzzy).\n"
 
-#: ../urpmi_.c:83 ../urpmq_.c:54
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - �ѧ�Ѻ invocation �֧��������ࡨ�����������\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - �����繵�ͧ�����ǹ��ࡨ����������Ѻ����ҹ��\n"
 
-#: ../urpmi_.c:84
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - ����������Դ�����ࡨ������ͧ\n"
-"                   ��Ǩ�ͺ �����������\n"
+#: ../urpmi:1
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - ��������ա�ä�����ࡨ�ҡ����͹���\n"
 
-#: ../urpmi_.c:86
+#: ../urpmi:1
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - ���͡���������ç�Ѻ����觷������\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --media        - ���͡��੾������·��١��鹴�������ͧ�����١���\n"
+
+#: ../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  - ��������������ö�Դ�����ࡨ�������繵�ͧ\n"
-"                   �ա�õ�Ǩ�ͺ�������������Ф����١��ͧ\n"
+"  --verify-rpm   - ��Ǩ�ͺ�����١��ͧ�ͧ rpm signature ��͹��õԴ���\n"
+"                   (--no-verify-rpm disable it, default is enabled)\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          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --best-output  - ���͡�Թ����࿫���շ���ش�����Ҿ������͹��繷�ͧ\n"
+"                   X ������������ѡ��\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi:1
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - ���Թ������ X\n"
+
+#: ../urpmi:1
+#, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
@@ -1141,430 +1237,467 @@ msgstr ""
 "  --env          - ��������͹��繷�Ẻ੾��(�·������Ѻ�����§ҹ\n"
 "                   �ѡ).\n"
 
-#: ../urpmi_.c:100
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - ���Թ������ X\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  - ���͡�Թ����࿫���շ���ش�����Ҿ������͹��繷�ͧ\n"
-"                   X ������������ѡ��\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\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 signature ��͹��õԴ���\n"
-"                   (--no-verify-rpm disable it, default is enabled)\n"
-
-#: ../urpmi_.c:106
-#, fuzzy
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --media        - ���͡��੾������·��١��鹴�������ͧ�����١���\n"
-
-#: ../urpmi_.c:107
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - ���͡���������ç�Ѻ����觷������\n"
-
-#: ../urpmi_.c:108
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - ��������ա�ä�����ࡨ�ҡ����͹���\n"
-
-#: ../urpmi_.c:109 ../urpmq_.c:66
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - �����繵�ͧ�����ǹ��ࡨ����������Ѻ����ҹ��\n"
-
-#: ../urpmi_.c:110 ../urpmq_.c:68
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - ���ä���Ẻ�����Ш�(�����ǡѺ����� --fuzzy).\n"
-
-#: ../urpmi_.c:111 ../urpmq_.c:69
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - ��ࡨ��������ࡨ�� (�����ǡѺ --src).\n"
+"  --proxy-user   - ��˹����ͼ����������ʼ�ҹ��������͡���\n"
+"                   㹡�õ�Ǩ�ͺ (�ٻẺ�� <user:password>)\n"
 
-#: ../urpmi_.c:112
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - ������º\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 ""
+"  --proxy        - ��㹡�á�˹����͡��� HTTP �����Ţ�������ص���\n"
+"                    1080(�ٻẺ��� <proxyhost[:port]>)\n"
 
-#: ../urpmi_.c:113 ../urpmq_.c:62
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - ������\n"
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr ""
 
-#: ../urpmi_.c:114
-#, fuzzy
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "����������ͪ��� rpm ���������㹤���觶١�Դ�������\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 ���ʹ֧�����������¹͡\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: ������͡������ѡ \"-%s\" ��Ǩ�ͺ�����ҡ --help\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - �� wget ���ʹ֧�����������¹͡\n"
 
-#: ../urpmi_.c:216
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
+"  --allow-force  - ��������������ö�Դ�����ࡨ�������繵�ͧ\n"
+"                   �ա�õ�Ǩ�ͺ�������������Ф����١��ͧ\n"
 
-#: ../urpmi_.c:223
+#: ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "�������ö���ҧ���礵���� [%s] ����Ѻ��§ҹ�ѡ"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - ����������Դ�����ࡨ������ͧ\n"
+"                   ��Ǩ�ͺ �����������\n"
 
-#: ../urpmi_.c:237
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - �ѧ�Ѻ invocation �֧��������ࡨ�����������\n"
 
-#: ../urpmi_.c:248
-msgid "Only superuser is allowed to install packages"
-msgstr "superuser ��ҹ�鹷�����Է�ԵԴ��� packages"
+#: ../urpmi:1
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - �� rpm ������١��� cache.\n"
 
-#: ../urpmi_.c:349
+#: ../urpmi:1
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "˹��� Packages ���仹���ͧ��㹡�èеԴ��� %s:"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - remove rpm from cache before anything else.\n"
 
-#: ../urpmi_.c:350
-msgid "One of the following packages is needed:"
-msgstr "˹��� Packages ���仹���ͧ���Ѻ��õԴ��� "
+#: ../urpmi:1
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpmi_.c:358
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "��ͧ������͡���ä�Ѻ  (1-%d) "
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - ��ࡨ��������ǹ�ͧ�� (�����ǡѺ -s).\n"
 
-#: ../urpmi_.c:361
-msgid "Sorry, bad choice, try again\n"
-msgstr "������͡���١��ͧ �ͧ�����Ѻ\n"
+#: ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - ����Ẻ�����Ш�(�����ǡѺ -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 ""
-"��ࡨ����˹����ҧ����������ö�Դ�����:\n"
-"%s\n"
-"�س��繴����������?"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --���͡�ѵ��ѵ�  - ���͡��ࡨ����ͧ����Ѿ�ô�ѵ��ѵ�\n"
 
-#: ../urpmi_.c:402
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "�������ö�Դ�����ࡨ %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#: ../urpmi_.c:407
+#: ../urpmi:1
 #, c-format
-msgid "due to unsatisfied %s"
+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 ������� %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"
 
-#: ../urpmi_.c:409
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget ����\n"
-
-#: ../urpmi_.c:414
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s �Ѵ��駡Ѻ %s"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "�������ö����ػ�ó�\"%s\"\n"
 
-#: ../urpmi_.c:416
-msgid "unrequested"
-msgstr ""
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "�������ö���ҧ�ػ�ó� \"%s\"\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 ""
-"��ࡨ���仹��е�ͧ�١ź������ͨзӡ���Ѿ�ô���������:\n"
 "%s\n"
-"�س������ӡ��ź����������?"
+" `with' ��辺����Ѻ�ػ�ó� ftp\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 "���ͷ�����㢻ѭ�ҡ����ҡѹ�� packages ���仹��ж١�Դ��� (%d MB)"
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
+"%s\n"
+"��辺<���ҧ�������Ǣ�ͧ�ͧhdlist>\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 ""
-"�س�е�ͧ���ٷ㹡�õԴ��� ����������� :\n"
 "%s\n"
+"�����繨е�ͧ��� <relative path �ͧ hdlist>�Ѻ -distrib"
 
-#: ../urpmi_.c:483 ../urpmq_.c:297
-msgid "unable to get source packages, aborting"
-msgstr "�������ö���¡ source package,���ѧ¡��ԡ"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "���ѧ��ҹ��������� rpm..."
 
-#: ../urpmi_.c:495
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi_.c:498
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"�ҧ���͡������ѡ '%s'\n"
 
-#: ../urpmi_.c:507
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "��س�����ػ�ó����ժ��� \"%s\" � [%s]"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - �ѧ�Ѻ������ҧ��� hdlist\n"
 
-#: ../urpmi_.c:508
-msgid "Press Enter when ready..."
-msgstr "��سҡ� enter ����;����"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
+msgstr "  -h             - ������������������ synthesis ���� hdlist\n"
 
-#: ../urpmi_.c:527
-msgid "The following packages have bad signatures"
-msgstr "��ࡨ���仹���� signatures ������١��ͧ"
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - �Ӥ������Ҵ��ǹ headers �ͧ���礵���� cache \n"
 
-#: ../urpmi_.c:528
-msgid "Do you want to continue installation ?"
-msgstr "�س�ѧ��ͧ��èеԴ����ա����������� ?"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
 
-#: ../urpmi_.c:540
-msgid " (y/N) "
-msgstr " (y/N) "
+#: ../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 ""
 
-#: ../urpmi_.c:548
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"��õԴ�����������պҧ�����Ҵ����\n"
-"���й����ӡ���Ѿവ�ҹ������ urpmi"
-
-#: ../urpmi_.c:557 ../urpmi_.c:588 ../urpmi_.c:597 ../urpmi_.c:612
-#: ../urpmi_.c:621
-msgid "Installation failed"
-msgstr "��õԴ�����������"
+"  --env          - ��������͹��繷�Ẻ੾��(�·������Ѻ�����§ҹ\n"
+"                   �ѡ).\n"
 
-#: ../urpmi_.c:572
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "distributing %s\n"
-msgstr "���ѧᨡ���� %s\n"
-
-#: ../urpmi_.c:604
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "��ͧ��÷��ͧ�Դ����·������ͧ��ͨ�ͺ������ҡѹ��? (y/N)"
+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 ""
 
-#: ../urpmi_.c:614
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "��ͧ��÷��ͧ�ѧ�Ѻ�Դ��� (--force)? (y/N)"
+#: ../urpmi.addmedia:1
+#, fuzzy, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr "  --distrib      - �ӡ�����ҧ����¨ҡ�ػ�ó�����Ѻ�Դ������ѵ��ѵ�\n"
 
-#: ../urpmi_.c:631
-msgid "Everything already installed"
-msgstr "�ء���ҧ��١�Դ������º��������"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - ���ҧ�ػ�ó����͡���Ѿവ\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 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"
-
-#: ../urpmq_.c:46
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - �ʴ���ª�����ࡨ���������\n"
+"and [options] are from\n"
 
-#: ../urpmq_.c:47
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media    - �ʴ���ª����ػ�ó���������\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"����բ����ŷ��зӡ������͡\n"
+"(˹��� %s)\n"
 
-#: ../urpmq_.c:48
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-node     - �ʴ���ª���nodes��������袳���--parallel \n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "��������÷�������͡(�� urpmi.addmedia ���������ػ�ó�)\n"
 
-#: ../urpmq_.c:49
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - �ʴ���ª��� parallel aliases.\n"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - ���͡����·�����\n"
 
-#: ../urpmq_.c:51
+#: ../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      - �¡��ǹ headers �ҡ��ࡨ����ʴ�������¡�âͧ urpmi db "
-"��ѧ\n"
-"                   stdout (੾���ٷ��ҹ��).\n"
+"�����: urpmi.removemedia [-a] <name> ...\n"
+"㹢�з�� <name> �繪��ͧ͢�ػ�ó����ͧ�������͡\n"
 
-#: ../urpmq_.c:53
+#: ../urpmi.update:1
+#, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --��      - ����鴢ͧ��ࡨ��͹��ǹ���Ŵ (੾���ٷ��ҹ��).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr "�Ҵ�����ŷ��й�� update(˹��� %s)\n"
 
-#: ../urpmq_.c:63
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - ���¡�ä����������֧����������Тͧ�����\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "����ա�����(use 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             - �ӡ��ź��ࡨ��駶�������������ش���Ѻ��õԴ���ŧ�����ͧ����\n"
-
-#: ../urpmq_.c:65
-#, fuzzy
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                  command line ������ժ��� package)"
-
-#: ../urpmq_.c:67
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverse search to what requires package.\n"
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "  -d             - �ѧ�Ѻ����ա�äӹdz�������´�ͧ��� depslist.ordered\n"
 
-#: ../urpmq_.c:70
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - ������������������\n"
+#: ../urpmi.update:1
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr " --a          - ���͡����·���������ö����͹����������� \n"
 
-#: ../urpmq_.c:71
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - �����������蹡Ѻ����ʾ��������\n"
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - �������Ѿവ�����\n"
 
-#: ../urpmq_.c:73
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "���ͧ͢������ͧ͢ rpm ������ҡ����觷��������ѧ�١����\n"
+#: ../urpmi.update:1
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"�����: urpmi.update [options] <name> ...\n"
+"�·�� <name> �繪��ͧ͢�ػ�ó����ͧ����Ѿവ\n"
 
-#: ../urpmq_.c:174
+#: ../urpmq:1
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes can only be used with --parallel"
 
-#: placeholder.h:18
+#: ../urpmq:1
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf ������� %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq:�������ö��ҹ rpm file \"%s\"\n"
 
-#: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
-
-#: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr "���������� �������öᨡ��������������͹� GNUGPL."
-
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "�����ҹ:urpmf [options] <file>"
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: ������͡������ѡ \"-%s\",��Ǩ�ͺ�����ҡ --help\n"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr " --quiet        - ����ͧ�������� Tag (default ��� tag �����١�к�� command"
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "���ͧ͢������ͧ͢ rpm ������ҡ����觷��������ѧ�١����\n"
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
-msgstr "                  line,�������Ѻ���� interactive). "
+#: ../urpmq:1
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - �����������蹡Ѻ����ʾ��������\n"
 
-#: placeholder.h:24
-msgid "  --all           - print all tags."
-msgstr " --all          - ����� tag ������"
+#: ../urpmq:1
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - ������������������\n"
 
-#: placeholder.h:25
-msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr " --name         - �������� tag:  ������� rpm (���ص��� tag �����١�к��"
+#: ../urpmq:1
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverse search to what requires package.\n"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr "                  command line ������ժ��� package)"
 
-#: placeholder.h:27
-msgid "  --group         - print tag group: group."
-msgstr " --group        - ����� tag group: group."
-
-#: placeholder.h:28
-msgid "  --size          - print tag size: size."
-msgstr " --size         - ����좹Ҵ tag:��Ҵ"
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - �ӡ��ź��ࡨ��駶�������������ش���Ѻ��õԴ���ŧ�����ͧ����\n"
 
-#: placeholder.h:29
-msgid "  --serial        - print tag serial: serial."
-msgstr " --serial       - ����� tag serial: serial"
+#: ../urpmq:1
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - ���¡�ä����������֧����������Тͧ�����\n"
 
-#: placeholder.h:30
-msgid "  --summary       - print tag summary: summary."
-msgstr " --summary      - ����� tag summary: summary"
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --��      - ����鴢ͧ��ࡨ��͹��ǹ���Ŵ (੾���ٷ��ҹ��).\n"
 
-#: placeholder.h:31
-msgid "  --description   - print tag description: description."
-msgstr " --description  - ����� tag ��������´  : ��������´"
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - �¡��ǹ headers �ҡ��ࡨ����ʴ�������¡�âͧ urpmi db "
+"��ѧ\n"
+"                   stdout (੾���ٷ��ҹ��).\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr " --provides     -�����  tag provides: all provides (���º�÷Ѵ). "
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - �ʴ���ª��� parallel aliases.\n"
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr " --requires     - �����  tag ����ͧ���:����ͧ��÷�����(���º�÷Ѵ)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-node     - �ʴ���ª���nodes��������袳���--parallel \n"
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr " --files        - �����  tag files: file ������ (���º�÷Ѵ)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media    - �ʴ���ª����ػ�ó���������\n"
 
-#: placeholder.h:35
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr " --conflicts    -����� tag �����ҡѹ�����:��ҡѹ����������(���º�÷Ѵ)."
+#: ../urpmq:1
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - �ʴ���ª�����ࡨ���������\n"
 
-#: placeholder.h:36
+#: ../urpmq:1
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr " --obsoletes    -����� tag ���������:������������(���º�÷Ѵ)."
-
-#: 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 ""
-" --prereqa      - ����� tag ��觷����繵�ͧ�ӡ�͹: ��觷����繵�ͧ�ӡ�͹������(���º�÷Ѵ)."
-
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "try urpmf --help �շҧ����������͡�ҡ"
-
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "��辺��¡������Ѻ�����"
+"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"
 
-#~ msgid "curl failed: exited with %d or signal %d\n"
-#~ msgstr "curl ��������͡���� %d ���ʹ����ѭ�ҳ %d\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "Installation failed on node %s"
+msgstr "��õԴ��駺� %s ��������"
 
-#~ msgid "rsync is missing\n"
-#~ msgstr "rsync ����\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "rsync failed: exited with %d or signal %d\n"
-#~ msgstr "rsync ��������͡�ҡ�к����� %d ���ʹ����ѭ�ҳ %d\n"
+#: ../urpm/parallel_ka_run.pm:1
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
 
-#~ msgid "ssh is missing\n"
-#~ msgstr "ssh ���������\n"
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "on node %s"
+msgstr ""
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "�բ�ͼԴ��Ҵ� config file ��÷Ѵ��� %s"
+#: ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "scp failed on host %s"
+msgstr "��õԴ��駺� %s ��������"
 
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr "�ػ�ó�\"%s\"��������� hdlist������������� ,�ػ�ó�١¡��ԡ�����"
+#: ../urpm/parallel_ssh.pm:1
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr "����ͧ %s ����� urpmi ���١��ͧ"
 
 #~ msgid "Remove them all?"
 #~ msgstr "��ͧ���ź����������������?"
@@ -1589,12 +1722,6 @@ msgstr "��辺��¡������Ѻ�����"
 #~ msgid "  -h             - print this help message.\n"
 #~ msgstr "  -h             - ������ͤ�������\n"
 
-#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-#~ msgstr "urpmq: ������͡������ѡ \"-%s\",��Ǩ�ͺ�����ҡ --help\n"
-
-#~ msgid "urpmq: cannot read rpm file \"%s\"\n"
-#~ msgstr "urpmq:�������ö��ҹ rpm file \"%s\"\n"
-
 #~ msgid "unable to build hdlist: %s"
 #~ msgstr "�������ö���ҧ hdlist:%s"
 
@@ -1663,9 +1790,6 @@ msgstr "��辺��¡������Ѻ�����"
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#~ msgid "bad proxy declaration on command line\n"
-#~ msgstr "����駾��͡���������\n"
-
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr "�����: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 
diff --git a/po/tr.po b/po/tr.po
index 8a1c29cd..dee84d1c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,7 +13,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-02-19 11:46+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <kde-i18n-tr@kde.org>\n"
@@ -21,1113 +21,1242 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:578
-#, c-format
-msgid "installing %s\n"
-msgstr "%s kuruluyor\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 "EeYy"
 
-#: ../_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 "HhNn"
+
+#: placeholder.h:18
 #, c-format
+msgid "urpmf version %s"
+msgstr "urpmf sürüm %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Telif Hakkı (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 ""
-"Otomatik paket kurulumu...\n"
-"%s paketinin kurulmasını istemiştiniz.\n"
+"Bu bir serbest yazılımdır ve GNU GPL Lisansı altında tekrar dağıtılabilir."
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:467
-msgid "Is this OK?"
-msgstr "Tamam mı?"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "Kullanımı: urpmf [seçenekler] <dosya>"
 
-#: ../_irpm_.c:35 ../urpmi_.c:122
-msgid "Ok"
-msgstr "Tamam"
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr ""
+"  --quiet          etiket isimlerini göstermez (etiket girilmediği sürece ön "
+"tanımlıdır"
 
-#: ../_irpm_.c:36 ../urpmi_.c:123
-msgid "Cancel"
-msgstr "İptal"
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "                    öntanımlıdır , etkileşimli kiple uyumsuzdur)."
 
-#: ../_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 "HhNn"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           - tüm etiketler gösterilir."
 
-#: ../_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 "EeYy"
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr ""
+"  --name          - isim: rpm dosyaismi etiketi gösterilir (paket ismi "
+"olmaksızın"
 
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:388 ../urpmi_.c:428
-#: ../urpmi_.c:475
-msgid " (Y/n) "
-msgstr " (E/h) "
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    komut satırı ama paket ismi yok)."
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - grup: grup etiketini gösterir."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - boyut: boyut etiketi gösterilir."
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - seri no: seri no. etiketi gösterilir."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - özet: özet etiketi gösterilir."
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  -description    - açıklama: açıklama etiketi gösterilir."
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr ""
+"  --provides      - yazdırma etiketi sağlamak:  tüm sağlananlar(çoklu satır) "
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - gerekli: gerekenler etiketini gösterir."
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - dosyalar: tüm dosyalar etiketlerini gösterir."
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr "  --conflicts     - çelişkiler: tüm çelişenler etiketleri gösterilir."
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr "  --obsoletes     - süprüntü: tüm eskiler etiketleri gösterilir."
 
-#: ../_irpm_.c:63
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr ""
+"  --prereqs       - öngerekli: tüm önceden gereklilikler etiketleri "
+"gösterilir."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "Ayrıntılı bilgi için 'urpmf --help' yazınız"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "ortam listesinin tamamı bulunamadı"
+
+#: ../_irpm:1
 #, c-format
 msgid "%s: command not found\n"
 msgstr "%s: komut bulunamadı\n"
 
-#: ../urpm.pm_.c:178
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Bilinmeyen webfetch `%s' !!!\n"
+msgid " (Y/n) "
+msgstr " (E/h) "
 
-#: ../urpm.pm_.c:197
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s için bilinmeyen protokol tanımlanmış"
+msgid "Cancel"
+msgstr "İptal"
 
-#: ../urpm.pm_.c:210
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "webfetch (curl veya wget ) bulunamadı\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "Ok"
+msgstr "Tamam"
 
-#: ../urpm.pm_.c:226
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "%s protokolü ile ilgilenemiyor"
+msgid "Is this OK?"
+msgstr "Tamam mı?"
 
-#: ../urpm.pm_.c:246
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...kopyalama başarısız"
+#: ../_irpm:1
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Otomatik paket kurulumu...\n"
+"%s paketinin kurulmasını istemiştiniz.\n"
 
-#: ../urpm.pm_.c:251
-msgid "wget is missing\n"
-msgstr "wget kayıp\n"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "%s kuruluyor\n"
 
-#: ../urpm.pm_.c:288
+#: ../urpm.pm:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget başarısız: %d ile veya %d sinyali ile çıkıldı.\n"
+msgid "unable to open rpmdb"
+msgstr "rpmdb açılamıyor"
 
-#: ../urpm.pm_.c:291
-msgid "curl is missing\n"
-msgstr "curl kayıp\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "rpm dosyasına [%s] erişilemiyor"
 
-#: ../urpm.pm_.c:556
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "\"%s\" kullanımda olan listeyi kullanmaya çalışıyor, yoksayıldı"
+msgid "%s conflicts with %s"
+msgstr "%s %s'le çelişiyor"
 
-#: ../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 ""
-"liste dosyası başka ortam tarafından kullanıldığından \"%s\" ile "
-"çalışılamıyor"
+msgid "%s is needed by %s"
+msgstr "%s %s tarafından isteniyor"
 
-#: ../urpm.pm_.c:578
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "kullanımda olduğundan isimsiz ortam için \"%s\" ismi kullanılamıyor"
+msgid "unable to install package %s"
+msgstr "%s paketi yüklenemiyor"
 
-#: ../urpm.pm_.c:585
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "\"%s\" ortamı, liste dosyası [%s] olmadığından hesap içine alınamıyor"
+msgid "unable to remove package %s"
+msgstr "paket kalırılamıyor: %s"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "hdlist dosyasının [%s] ortamı saptanamıyor"
+msgid "Preparing..."
+msgstr "Hazırlanıyor..."
 
-#: ../urpm.pm_.c:598
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "\"%s\" ortamının hdlist dosyasına erişilemiyor, yoksayıldı"
+msgid "...retrieving failed: %s"
+msgstr "...getirme başarısız: [%s]"
 
-#: ../urpm.pm_.c:600
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "\"%s\" ortamının liste dosyasına erişilemiyor, yoksayıldı"
+msgid "...retrieving done"
+msgstr "...ele alma tamamlandı"
 
-#: ../urpm.pm_.c:614
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "rpm dosyası [%s] \"%s\" ortamından okunamıyor"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
+msgid "malformed input: [%s]"
+msgstr "bozuk girdi: [%s]"
 
-#: ../urpm.pm_.c:622
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "\"%s\" için sabit disk listesi dosyası bulunamıyor, ortam yoksayıldı"
+msgid "unable to access medium \"%s\""
+msgstr "\"%s\" ortamına erişilemiyor"
 
-#: ../urpm.pm_.c:628
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "\"%s\" için liste dosyası bulunamıyor, ortam yoksayılıyor"
+msgid "urpmi database locked"
+msgstr "urpmi veri tabanı kilitlendi"
 
-#: ../urpm.pm_.c:651
+#: ../urpm.pm:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" için liste dosyası tutarsız, ortam yoksayıldı"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"tutarsız ortam \"%s\" kaldırılabilir olarak imlenmiş ama bu doğru değil"
 
-#: ../urpm.pm_.c:659
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\" için liste dosyası denetlenemiyor, ortam yoksayıldı"
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" seçilmedi"
 
-#: ../urpm.pm_.c:690
+#: ../urpm.pm:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "\"%s\" çıkarılabilir ortam için çok bazla bağlantı noktası tanımlı"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "rpm dosyası [%s] \"%s\" ortamından okunamıyor"
 
-#: ../urpm.pm_.c:691
+#: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "\"%s\" çıkarılabilir aygıt olarak alındı."
+msgid "package %s is not found."
+msgstr "%s paketi bulunamadı."
 
-#: ../urpm.pm_.c:695
+#: ../urpm.pm:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Farklı %s çıkarılabilir aygıtları %s için  kullanılıyor"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm_.c:700 ../urpm.pm_.c:703
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "\"%s\" ayrılabilir aygıtı için yolismi ele alınamadı"
+msgid ""
+"medium \"%s\" use an invalid list file (mirror is problably not up-to-date, "
+"trying to use alternate method)"
+msgstr ""
 
-#: ../urpm.pm_.c:716
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "yapılandırma dosyasına [%s] yazılamıyor"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "aynı \"%s\" isminde çok sayıda rpm paketi var."
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm:1
 #, c-format
-msgid "write config file [%s]"
-msgstr "yapılandırma dosyası [%s] yazılıyor"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "[%s] (\"%s\" değerindeki) düzgün ayrıştırılamıyor"
 
-#: ../urpm.pm_.c:755
+#: ../urpm.pm:1 ../urpme:1
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "\"%2$s\" dosyasındaki \"%1$s\" ayrıştırılamıyor"
+msgid "The following packages contain %s: %s"
+msgstr "Bu paketler %s içeriyor: %s"
 
-#: ../urpm.pm_.c:766
+#: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "\"%s\" dosyasındaki paralel işleyici inceleniyor"
+msgid "no package named %s"
+msgstr "%s adında bir paket yok"
 
-#: ../urpm.pm_.c:776
+#: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "düğümler için paralel işleyici bulundu: %s"
+msgid "error registering local packages"
+msgstr "yerel paketlerin sicil kaydı yapılırken hata"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "rpm dosyasına [%s] erişilemiyor"
 
-#: ../urpm.pm_.c:780
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "\"%s\" için açıklama dosyası getiriliyor..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "invalid rpm file name [%s]"
+msgstr "rpm dosya ismi [%s] geçersiz"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "paralel seçenek \"%s\" kullanılamadı"
+msgid "no entries relocated in depslist"
+msgstr "bağımlılıklar listesindeki hiç bir giriş yeniden konumlanamadı"
 
-#: ../urpm.pm_.c:795
-msgid "--synthesis cannot be used with --media, --update or --parallel"
-msgstr "--synthesis; --media, --update veya --parallel ile kullanılamaz"
+#: ../urpm.pm:1
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "bağımlılıklar listesindeki %s girdileri yeniden konumlandırıldı"
 
-#: ../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 "unmounting %s"
+msgstr "%s ayrılıyor"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "mounting %s"
+msgstr "%s bağlanıyor"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "arabellekteki %d eski başlık kaldırılıyor"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "found %d headers in cache"
+msgstr "arabellekte %d başlığı bulundu"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "\"%s\" için sabit disk listesi sentezleme dosyası oluşturuldu."
+
+#: ../urpm.pm:1
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "sabit disk listesi(hdlist) dosyası [%s] okunuyor"
 
-#: ../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]"
 msgstr "sentez dosyası [%s] inceleniyor"
 
-#: ../urpm.pm_.c:825
+#: ../urpm.pm:1
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "\"%s\" ortamı için sabit disk listesi okunurken hata"
+msgid "building hdlist [%s]"
+msgstr "sabit disk listesi [%s] oluşturuluyor"
 
-#: ../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\""
-msgstr "\"%s\" için sabit disk listesi sentezleme dosyasının okunmasında hata"
+msgid "reading headers from medium \"%s\""
+msgstr "\"%s\" ortamından başlıklar okunuyor"
 
-#: ../urpm.pm_.c:852 ../urpm.pm_.c:2019 ../urpm.pm_.c:2441 ../urpm.pm_.c:2525
-msgid "unable to open rpmdb"
-msgstr "rpmdb açılamıyor"
+#: ../urpm.pm:1
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "bağımlılıkların hesaplanması için ikinci geçiş yapılıyor\n"
 
-#: ../urpm.pm_.c:890
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" ortamı zaten var"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "\"%s\" için sabit disk listesi sentezleme dosyasının okunmasında hata"
 
-#: ../urpm.pm_.c:918
+#: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
-msgstr "%s ortamı eklendi"
+msgid "nothing written in list file for \"%s\""
+msgstr "\"%s\" için liste dosyasına hiçbir şey yazılmamış"
 
-#: ../urpm.pm_.c:933
-msgid "unable to access first installation medium"
-msgstr "İlk kurulum ortamına erişilemiyor"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
 
-#: ../urpm.pm_.c:937
-msgid "copying hdlists file..."
-msgstr "sabit disk listesi dosyası (hdlist) [%s] kopyalanıyor..."
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "\"%s\" liste dosyası yazılamıyor"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1178 ../urpm.pm_.c:1233
-msgid "...copying done"
-msgstr "...kopyalama tamamlandı"
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "%s dosyası %s ortamında zaten kullanılmış"
 
-#: ../urpm.pm_.c:939 ../urpm.pm_.c:1165 ../urpm.pm_.c:1175 ../urpm.pm_.c:1233
-#, fuzzy
-msgid "...copying failed"
-msgstr "...kopyalama tamamlandı"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "\"%s\" sabit disk listesi dosyası ayrıştırılamıyor"
 
-#: ../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)"
-msgstr ""
-"İlk kurulum ortamına erişilemiyor ( Mandrake/base/hdlists dosyası bulunamadı)"
+#: ../urpm.pm:1
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
 
-#: ../urpm.pm_.c:947
-msgid "retrieving hdlists file..."
-msgstr "hard disk rpm listesi (hdlists) alınıyor..."
+#: ../urpm.pm:1
+#, c-format
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "kaynak sabit disk listesi (ya da sentez) dosyası alımı başarısız oldu"
 
-#: ../urpm.pm_.c:953 ../urpm.pm_.c:1291 ../urpm.pm_.c:1353 ../urpm.pm_.c:1855
-#: ../urpm.pm_.c:2352
-msgid "...retrieving done"
-msgstr "...ele alma tamamlandı"
+#: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "MD5SUM dosyası sınanıyor"
 
-#: ../urpm.pm_.c:955 ../urpm.pm_.c:1347 ../urpm.pm_.c:1858 ../urpm.pm_.c:2355
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) kopyalanıyor..."
+
+#: ../urpm.pm:1
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...getirme başarısız: [%s]"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) getiriliyor..."
 
-#: ../urpm.pm_.c:975
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "sabit disk listesi dosyasındaki sabit disk açıklaması %s geçersiz"
+msgid "retrieving description file of \"%s\"..."
+msgstr "\"%s\" için açıklama dosyası getiriliyor..."
 
-#: ../urpm.pm_.c:1017
+#: ../urpm.pm:1
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "varolmayan \"%s\" ortamı seçilmeye çalışılıyor"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] de rpm dosyaları yok"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "[%s]'den rpm dosyaları okunamadı: %s"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "Çoklu medya seçiliyor: %s"
+msgid "reading rpm files from [%s]"
+msgstr "rpm dosyaları [%s]'den okunuyor"
 
-#: ../urpm.pm_.c:1035
+#: ../urpm.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "aygıt kaldırılıyor \"%s\""
+msgid "...copying done"
+msgstr "...kopyalama tamamlandı"
 
-#: ../urpm.pm_.c:1081 ../urpm.pm_.c:2270
-msgid "urpmi database locked"
-msgstr "urpmi veri tabanı kilitlendi"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "...kopyalama tamamlandı"
 
-#: ../urpm.pm_.c:1133 ../urpm.pm_.c:2281
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" ortamına erişilemiyor"
+msgid "copying source list of \"%s\"..."
+msgstr "\"%s\"in kaynak listesi kopyalanıyor..."
 
-#: ../urpm.pm_.c:1163
+#: ../urpm.pm:1
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\"in açıklama dosyası kopyalanıyor..."
+msgid "copy of [%s] failed"
+msgstr "[%s] kopyalaması başarısız"
 
-#: ../urpm.pm_.c:1171
+#: ../urpm.pm:1
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) kopyalanıyor..."
 
-#: ../urpm.pm_.c:1182
+#: ../urpm.pm:1
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "[%s] kopyalaması başarısız"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\"in açıklama dosyası kopyalanıyor..."
 
-#: ../urpm.pm_.c:1187 ../urpm.pm_.c:1366
-msgid "examining MD5SUM file"
-msgstr "MD5SUM dosyası sınanıyor"
+#: ../urpm.pm:1
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "aygıt kaldırılıyor \"%s\""
 
-#: ../urpm.pm_.c:1231
+#: ../urpm.pm:1
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "\"%s\"in kaynak listesi kopyalanıyor..."
+msgid "selecting multiple media: %s"
+msgstr "Çoklu medya seçiliyor: %s"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "rpm dosyaları [%s]'den okunuyor"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm_.c:1267
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "[%s]'den rpm dosyaları okunamadı: %s"
+msgid "trying to select inexistent medium \"%s\""
+msgstr "varolmayan \"%s\" ortamı seçilmeye çalışılıyor"
 
-#: ../urpm.pm_.c:1272
+#: ../urpm.pm:1
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] de rpm dosyaları yok"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"İlk kurulum ortamına erişilemiyor ( Mandrake/base/hdlists dosyası bulunamadı)"
 
-#: ../urpm.pm_.c:1285
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "\"%s\" için açıklama dosyası getiriliyor..."
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "sabit disk listesi dosyasındaki sabit disk açıklaması %s geçersiz"
 
-#: ../urpm.pm_.c:1300
+#: ../urpm.pm:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) getiriliyor..."
+msgid "retrieving hdlists file..."
+msgstr "hard disk rpm listesi (hdlists) alınıyor..."
 
-#: ../urpm.pm_.c:1425
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "kaynak sabit disk listesi (ya da sentez) dosyası alımı başarısız oldu"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copying hdlists file..."
+msgstr "sabit disk listesi dosyası (hdlist) [%s] kopyalanıyor..."
 
-#: ../urpm.pm_.c:1432
+#: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
+msgid "unable to access first installation medium"
+msgstr "İlk kurulum ortamına erişilemiyor"
 
-#: ../urpm.pm_.c:1444 ../urpm.pm_.c:1496
+#: ../urpm.pm:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "%s dosyası %s ortamında zaten kullanılmış"
+msgid "added medium %s"
+msgstr "%s ortamı eklendi"
 
-#: ../urpm.pm_.c:1480
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "\"%s\" sabit disk listesi dosyası ayrıştırılamıyor"
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" ortamı zaten var"
 
-#: ../urpm.pm_.c:1519
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "\"%s\" liste dosyası yazılamıyor"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "\"%s\" ortamı için sabit disk listesi okunurken hata"
 
-#: ../urpm.pm_.c:1526
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
+#: ../urpm.pm:1
+#, c-format
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr "--synthesis; --media, --update veya --parallel ile kullanılamaz"
 
-#: ../urpm.pm_.c:1528
+#: ../urpm.pm:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "\"%s\" için liste dosyasına hiçbir şey yazılmamış"
+msgid "unable to use parallel option \"%s\""
+msgstr "paralel seçenek \"%s\" kullanılamadı"
 
-#: ../urpm.pm_.c:1578
-msgid "performing second pass to compute dependencies\n"
-msgstr "bağımlılıkların hesaplanması için ikinci geçiş yapılıyor\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr ""
 
-#: ../urpm.pm_.c:1592
+#: ../urpm.pm:1
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "\"%s\" ortamından başlıklar okunuyor"
+msgid "found parallel handler for nodes: %s"
+msgstr "düğümler için paralel işleyici bulundu: %s"
 
-#: ../urpm.pm_.c:1597
+#: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "sabit disk listesi [%s] oluşturuluyor"
+msgid "examining parallel handler in file [%s]"
+msgstr "\"%s\" dosyasındaki paralel işleyici inceleniyor"
 
-#: ../urpm.pm_.c:1609 ../urpm.pm_.c:1628
+#: ../urpm.pm:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "\"%s\" için sabit disk listesi sentezleme dosyası oluşturuldu."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "\"%2$s\" dosyasındaki \"%1$s\" ayrıştırılamıyor"
 
-#: ../urpm.pm_.c:1647
+#: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
-msgstr "arabellekte %d başlığı bulundu"
+msgid "write config file [%s]"
+msgstr "yapılandırma dosyası [%s] yazılıyor"
 
-#: ../urpm.pm_.c:1651
+#: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "arabellekteki %d eski başlık kaldırılıyor"
+msgid "unable to write config file [%s]"
+msgstr "yapılandırma dosyasına [%s] yazılamıyor"
 
-#: ../urpm.pm_.c:1798
+#: ../urpm.pm:1
 #, c-format
-msgid "mounting %s"
-msgstr "%s bağlanıyor"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "\"%s\" ayrılabilir aygıtı için yolismi ele alınamadı"
 
-#: ../urpm.pm_.c:1811
+#: ../urpm.pm:1
 #, c-format
-msgid "unmounting %s"
-msgstr "%s ayrılıyor"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "Farklı %s çıkarılabilir aygıtları %s için  kullanılıyor"
 
-#: ../urpm.pm_.c:1833
+#: ../urpm.pm:1
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "bağımlılıklar listesindeki %s girdileri yeniden konumlandırıldı"
+msgid "taking removable device as \"%s\""
+msgstr "\"%s\" çıkarılabilir aygıt olarak alındı."
 
-#: ../urpm.pm_.c:1834
-msgid "no entries relocated in depslist"
-msgstr "bağımlılıklar listesindeki hiç bir giriş yeniden konumlanamadı"
+#: ../urpm.pm:1
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "\"%s\" çıkarılabilir ortam için çok bazla bağlantı noktası tanımlı"
 
-#: ../urpm.pm_.c:1847
+#: ../urpm.pm:1
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "rpm dosya ismi [%s] geçersiz"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\" için liste dosyası denetlenemiyor, ortam yoksayıldı"
 
-#: ../urpm.pm_.c:1853
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "\"%s\" için açıklama dosyası getiriliyor..."
+#: ../urpm.pm:1
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" için liste dosyası tutarsız, ortam yoksayıldı"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:2479
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "rpm dosyasına [%s] erişilemiyor"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "\"%s\" için liste dosyası bulunamıyor, ortam yoksayılıyor"
 
-#: ../urpm.pm_.c:1865
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "rpm dosyasına [%s] erişilemiyor"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "\"%s\" için sabit disk listesi dosyası bulunamıyor, ortam yoksayıldı"
 
-#: ../urpm.pm_.c:1868
-msgid "error registering local packages"
-msgstr "yerel paketlerin sicil kaydı yapılırken hata"
+#: ../urpm.pm:1
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
 
-#: ../urpm.pm_.c:1960
+#: ../urpm.pm:1
 #, c-format
-msgid "no package named %s"
-msgstr "%s adında bir paket yok"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "\"%s\" ortamının liste dosyasına erişilemiyor, yoksayıldı"
 
-#: ../urpm.pm_.c:1963 ../urpme_.c:88
+#: ../urpm.pm:1
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Bu paketler %s içeriyor: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "\"%s\" ortamının hdlist dosyasına erişilemiyor, yoksayıldı"
 
-#: ../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\""
-msgstr "aynı \"%s\" isminde çok sayıda rpm paketi var."
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "hdlist dosyasının [%s] ortamı saptanamıyor"
 
-#: ../urpm.pm_.c:2147
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "[%s] (\"%s\" değerindeki) düzgün ayrıştırılamıyor"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "\"%s\" ortamı, liste dosyası [%s] olmadığından hesap içine alınamıyor"
 
-#: ../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)"
-msgstr ""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "kullanımda olduğundan isimsiz ortam için \"%s\" ismi kullanılamıyor"
 
-#: ../urpm.pm_.c:2174
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"liste dosyası başka ortam tarafından kullanıldığından \"%s\" ile "
+"çalışılamıyor"
 
-#: ../urpm.pm_.c:2183
+#: ../urpm.pm:1
 #, c-format
-msgid "package %s is not found."
-msgstr "%s paketi bulunamadı."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "\"%s\" kullanımda olan listeyi kullanmaya çalışıyor, yoksayıldı"
 
-#: ../urpm.pm_.c:2231 ../urpm.pm_.c:2234 ../urpm.pm_.c:2256
+#: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" seçilmedi"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"\"%s\" ortamı, halen kullanımdaki hdlist'i kullanmaya çalışıyor, yoksayıldı"
 
-#: ../urpm.pm_.c:2249
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "rpm dosyası [%s] \"%s\" ortamından okunamıyor"
+msgid "syntax error in config file at line %s"
+msgstr "yapılandırma dosyasının %s satırında sözdizimi hatası"
 
-#: ../urpm.pm_.c:2260
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
-"tutarsız ortam \"%s\" kaldırılabilir olarak imlenmiş ama bu doğru değil"
 
-#: ../urpm.pm_.c:2337
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "bozuk girdi: [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpm.pm_.c:2344
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "rpm dosyası [%s] \"%s\" ortamından okunamıyor"
+#: ../urpm.pm:1
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync başarısız: %d ile veya %d sinyali ile çıkıldı\n"
 
-#: ../urpm.pm_.c:2417
-msgid "Preparing..."
-msgstr "Hazırlanıyor..."
+#: ../urpm.pm:1
+#, c-format
+msgid "ssh is missing\n"
+msgstr "ssh kayıp\n"
 
-#: ../urpm.pm_.c:2448
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to remove package %s"
-msgstr "paket kalırılamıyor: %s"
+msgid "rsync is missing\n"
+msgstr "rsysnc kayıp\n"
 
-#: ../urpm.pm_.c:2457
+#: ../urpm.pm:1
 #, c-format
-msgid "unable to install package %s"
-msgstr "%s paketi yüklenemiyor"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl başarısız: %d ile veya %d sinyali ile çıkıldı\n"
 
-#: ../urpm.pm_.c:2466
+#: ../urpm.pm:1
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s %s tarafından isteniyor"
+msgid "curl is missing\n"
+msgstr "curl kayıp\n"
 
-#: ../urpm.pm_.c:2467
+#: ../urpm.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s %s'le çelişiyor"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget başarısız: %d ile veya %d sinyali ile çıkıldı.\n"
 
-#: ../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 ""
+#: ../urpm.pm:1
+#, c-format
+msgid "wget is missing\n"
+msgstr "wget kayıp\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 ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "copy failed: %s"
+msgstr "...kopyalama başarısız"
 
-#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#: ../urpm.pm:1
 #, c-format
-msgid "on node %s"
-msgstr ""
+msgid "unable to handle protocol: %s"
+msgstr "%s protokolü ile ilgilenemiyor"
 
-#: ../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 "%s düğümde kurulum başarısız"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "webfetch (curl veya wget ) bulunamadı\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 "Kurulum Başarılı"
+#: ../urpm.pm:1
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "%s için bilinmeyen protokol tanımlanmış"
 
-#: ../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 ""
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Bilinmeyen webfetch `%s' !!!\n"
 
-#: ../urpm/parallel_ssh.pm_.c:167
+#: ../urpme:1
 #, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "%s bilgisayarında urpmi'nin iyi bir sürümü yok"
+msgid "Removing failed"
+msgstr "Kaldırma başarısız"
 
-#: ../urpme_.c:39
+#: ../urpme: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"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
-"urpme sürüm %s\n"
-"TelifHakkı (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Bu bir serbest yazılımdır ve GNU GPL Lisansı altında tekrar dağıtılabilir.\n"
-"\n"
-"kullanımı:\n"
-
-#: ../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         - bu yardım mesajını görüntüler.\n"
-
-#: ../urpme_.c:45 ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - Otomatik seçenekler arasından paketleri seç.\n"
-
-#: ../urpme_.c:46 ../urpmi_.c:105
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - kurulumun başarılı olup olmayacağını doğrula.\n"
+"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
+"gerekiyor (%d Mb)"
 
-#: ../urpme_.c:47 ../urpmi_.c:88 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - dağıtık urpmi (accross machines of alias).\n"
+#: ../urpme:1
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Kaldırılmak için sıradaki paketler sınanıyor"
 
-#: ../urpme_.c:48
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - ifadeye uyan tüm paketleri seçer. \n"
+#: ../urpme:1
+#, c-format
+msgid "Nothing to remove"
+msgstr "Kaldırılacak bir şey yok"
 
-#: ../urpme_.c:64
+#: ../urpme:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: \"-%s\" seçeneği bilinmiyor, ayrıntılı bilgi için --help\n"
+msgid "removing package %s will break your system"
+msgstr "%s paketinin kaldırılması sisteminizi göçertir"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown package"
 msgstr "bilinmeyen paket"
 
-#: ../urpme_.c:83
+#: ../urpme:1
+#, c-format
 msgid "unknown packages"
 msgstr "bilinmeyen paketler "
 
-#: ../urpme_.c:93
+#: ../urpme:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "%s paketinin kaldırılması sisteminizi göçertir"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: \"-%s\" seçeneği bilinmiyor, ayrıntılı bilgi için --help\n"
 
-#: ../urpme_.c:95
-msgid "Nothing to remove"
-msgstr "Kaldırılacak bir şey yok"
+#: ../urpme:1
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - ifadeye uyan tüm paketleri seçer. \n"
 
-#: ../urpme_.c:98
-msgid "Checking to remove the following packages"
-msgstr "Kaldırılmak için sıradaki paketler sınanıyor"
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, c-format
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - dağıtık urpmi (accross machines of alias).\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 ""
-"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
-"gerekiyor (%d Mb)"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - kurulumun başarılı olup olmayacağını doğrula.\n"
 
-#: ../urpme_.c:113
-msgid "Removing failed"
-msgstr "Kaldırma başarısız"
+#: ../urpme:1 ../urpmi:1
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - Otomatik seçenekler arasından paketleri seç.\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         - bu yardım mesajını görüntüler.\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 sürüm %s\n"
-"TelifHakkı (C) 2002 MandrakeSoft.\n"
+"urpme sürüm %s\n"
+"TelifHakkı (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Bu bir serbest yazılımdır ve GNU GPL Lisansı altında tekrar dağıtılabilir.\n"
 "\n"
-"Kullanımı:\n"
+"kullanımı:\n"
 
-#: ../urpmf_.c:32 ../urpmi_.c:73 ../urpmq_.c:41
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - sadece güncelleme ortamını kullan.\n"
+#: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-msgid "  --media        - use only the given media, separated by comma.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"  --media       - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
 
-#: ../urpmf_.c:34 ../urpmq_.c:43
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi veritabanı yerine verilen bireşimi kullan.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
 
-#: ../urpmf_.c:35
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose             - kalabalık kipi.\n"
+#: ../urpmf:1
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
 
-#: ../urpmf_.c:36
+#: ../urpmf:1
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf_.c:38
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - tüm etiketler yazır.\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"