i18n improvements

45 files changed, 7072 insertions, 2281 deletions

diff --git a/po/Makefile b/po/Makefile
index 5005a700..26e4596a 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,21 +1,31 @@
-POFILES = $(shell ls *.po)
-LOCALEDIR = $(PREFIX)/usr/share/locale
+# Installation directories
+localedir = $(prefix)/usr/share/locale
 
-all: $(POFILES)
+LANGS = $(shell ls *.po | xargs -i basename {} .po )
+PGOAL = urpmi
+GOALS = $(PGOAL).pot  $(foreach a, $(LANGS), $(a).mo)
 
-install: $(POFILES)
-	for i in $(POFILES:%.po=%); do \
-           install -d $(LOCALEDIR)/$$i/LC_MESSAGES ; \
-           cp -f $$i.po $(LOCALEDIR)/$$i/LC_MESSAGES/urpmi.po ; \
-        done
+# $(foreach a, $(LANGS), $($(a).mo))
+
+all: $(GOALS)
+
+install: all
+	for l in $(LANGS); do \
+		install -d $(localedir)/$$l/LC_MESSAGES; \
+		install -m 644 $$l.mo $(localedir)/$$l/LC_MESSAGES/$(PGOAL).mo; \
+	done
 
 clean:
-	rm -f messages empty.po $(POFILES:%=%t)
+	rm -f *~ *.[oas] *.mo $(GOALS) TAGS
+
+%.mo: %.po
+	msgfmt -o $@ $<
 
-$(POFILES): urpmi.pot
-	cp -f $@ $@t
-	msgmerge $@t $< > $@
-	rm $@t
+%.pot:	POTFILES.in
+	./create_placeholder 
+	xgettext --default-domain=`basename $@ .pot` --directory=.. \
+		--add-comments --keyword=__ --keyword=_ --keyword=N_ \
+		--keyword=I_ --keyword=i18n
+		--files-from=./POTFILES.in && \
+	mv `basename $@ .pot`.po $@
 
-urpmi.pot: ../urpmi
-	xgettext -L C -F -n --keyword=_ -o $@ $<
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 00000000..05e90c70
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,6 @@
+_irpm
+placeholder.h
+urpmf
+urpmi
+urpmi.addmedia
+urpmq
diff --git a/po/af.po b/po/af.po
index 62534e07..6f9ab597 100644
--- a/po/af.po
+++ b/po/af.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+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,31 +14,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "%s word installeer\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Is dit aanvaarbaar?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "OK"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Kanselleer"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "geen pakket het die naam %s nie\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Die volgende pakket bevat %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Wat is u keuse (1-%d)"
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "RPM-databasisnavraag het misluk\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Jammer, swak keuse, probeer weer\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -47,67 +126,97 @@ msgstr ""
 "How afhanklikhede te bevredig, moet die volgende pakkette installeer word "
 "(%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Is dit aanvaarbaar?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "OK"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Kanselleer"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sit asb. die %s getiteld %s in"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Druk ENTER wanneer u reg is..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Jammer ek kon nie lêer %s kry nie, totsiens"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "%s word installeer\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Installasie het misluk"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Moet ons die installasie afdwing (--force) ?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Wat is u keuse (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Jammer, swak keuse, probeer weer\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Mislukte afhanklikhede: %s benodig %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "geen pakket het die naam %s nie\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Die volgende pakket bevat %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "RPM-databasisnavraag het misluk\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Jammer ek kon nie lêer %s kry nie, totsiens"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Mislukte afhanklikhede: %s benodig %s"
diff --git a/po/az.po b/po/az.po
index 1006e3e5..94da1d90 100644
--- a/po/az.po
+++ b/po/az.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-09-13 15:55+0200\n"
 "Last-Translator: Vasif Ismailoglu <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani turksih <linuxaz@azerimail.net>\n"
@@ -13,101 +13,212 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "%s qurulur\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
 msgstr ""
-"istfadə qaydası: urpmi [-h] [--auto] [--force] [-a] paket_adı "
-"[paket_adları...]\n"
 
-#: ../urpmi:56
-msgid "Only superuser is allowed to install local packages"
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Oldu mu?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Oldu"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Ləğv et"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
 msgstr ""
-"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir'"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "%s adında bir paket yoxdur\n"
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
 
-#: ../urpmi:89
-#, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Bu paketlərdə %s vardır: %s\n"
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm bilgi hovuzuna yetiÅŸmÉ™ iflas etdi\n"
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr ""
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
 
-#: ../urpmi:107
+#: placeholder.h:8
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed "
-"(%d MB)"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
 msgstr ""
-"Ehtiyacı həll etmək  üçün, aşağıdakı paketlərin də qurulması lazımdır (%d Mb)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Oldu mu?"
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
 
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Oldu"
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
 
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Ləğv et"
+#: urpmi:118
+msgid "Only superuser is allowed to install local packages"
+msgstr ""
+"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru "
+"məs'uliyyətlidir'"
+
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
+
+#: urpmi:168
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Seçiminiz? (1-%d)"
+
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xətalı seçənək, təkrar sınayın\n"
 
-#: ../urpmi:159
+#: urpmi:194
 #, c-format
-msgid "Please insert the %s named %s"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Ehtiyacı həll etmək  üçün, aşağıdakı paketlərin də qurulması "
+"lazımdır (%d Mb)"
+
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "%s'i yerinə yerləşdirin (%s)"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Bittiği zaman enter düymesinə basın..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "%s dosyesi tapıla bilinmədi, çıxılır"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "hərşey artıq qurulmuşdur"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "%s qurulur\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Qurulum iflas etdi"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Paket ehtiyaclarını gözə almadan qurmağa çalışın"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Bəlkə daha zorlayıcı bir seçənək lazımdır (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Seçiminiz? (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xətalı seçənək, təkrar sınayın\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Ehtiyac olan paketlərde əksik %s üçün %s lazımdır"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "istfadə qaydası: urpmi [-h] [--auto] [--force] [-a] paket_adı "
+#~ "[paket_adları...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "%s adında bir paket yoxdur\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Bu paketlərdə %s vardır: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm bilgi hovuzuna yetiÅŸmÉ™ iflas etdi\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "%s dosyesi tapıla bilinmədi, çıxılır"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Ehtiyac olan paketlərde əksik %s üçün %s lazımdır"
diff --git a/po/bg.po b/po/bg.po
index a2b14aa4..826c2c8b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+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,32 +13,110 @@ msgstr ""
 "Content-Type: text/plain; charset=windows-1251\n"
 "Content-Transfer-Encoding: 8bits\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "èíñòàëèðàíå %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Òîâà äîáðå ëè å"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Äîáðå"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Îòêàç"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"èçïîëçâàíå: urpmi [-h] [--auto] [--force] [-a] èìå_íà_ïàêåò "
-"[èìåíà_íà_ïàêåòè...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Ñàìî superuser-à èìà ïðàâîòî äà èíñòàëèðà ëîêàëíè ïàêåòè"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "íÿìà ïàêåò íàðå÷åí %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Åäèí îò òåçè ïàêåòè å íåîáõîäèì:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Òåçè ïàêåòè ñúäúðæàò %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Êàêúâ å âàøèÿò èçáîð? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "äîíàñÿíå,rpm áàçà äàííè,ïðîâàëåíî\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ñúæàëÿâàì,ëîø èçáîð, îïèòàéòå îòíîâî\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -46,67 +124,98 @@ msgid ""
 msgstr ""
 "Çà äà ñå çàïàçÿò çàâèñèìîñòèòå,òåçè ïàêåòè ùå áúäàò èíñòàëèðàíè (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Òîâà äîáðå ëè å"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Äîáðå"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Îòêàç"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ìîëÿ ñëîæåòå %s íàðå÷åí %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Íàòèñíåòå enter,êîãàòî ñòå ãîòîâè"
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Ñúæàëÿâàì,íåìîãà äà íàìåðÿ ôàéë %s, èçëèçàì"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "âñè÷êî å èíñòàëèðàíî âå÷å"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "èíñòàëèðàíå %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Èíñòàëàöèÿòà ïðîâàëåíà"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Îïèò çà èíñòàëèðàíå áåç ïðîâåðêà íà çàâèñèìîñòè?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Îïèò çà èíñòàëèðàíå äàæå ïî-ñèëíî (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Åäèí îò òåçè ïàêåòè å íåîáõîäèì:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Êàêúâ å âàøèÿò èçáîð? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ñúæàëÿâàì,ëîø èçáîð, îïèòàéòå îòíîâî\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Ïðîâàëåíè çàâèñèìîñòè : %s èçèñêâà  %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "èçïîëçâàíå: urpmi [-h] [--auto] [--force] [-a] èìå_íà_ïàêåò "
+#~ "[èìåíà_íà_ïàêåòè...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "íÿìà ïàêåò íàðå÷åí %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Òåçè ïàêåòè ñúäúðæàò %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "äîíàñÿíå,rpm áàçà äàííè,ïðîâàëåíî\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Ñúæàëÿâàì,íåìîãà äà íàìåðÿ ôàéë %s, èçëèçàì"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Ïðîâàëåíè çàâèñèìîñòè : %s èçèñêâà  %s"
diff --git a/po/ca.po b/po/ca.po
index 2000b895..bce67b31 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-06-12 22:00+0200\n"
 "Last-Translator: Quico Llach <quico@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -13,31 +13,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "s'està instal·lant %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "És correcte?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "D'acord"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"sintaxi: urpmi [-h] [--auto] [--force] [-a] nom_paquet [noms_paquets...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "El superusuari és l'únic autoritzat per instal·lar paquets locals"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "no hi cap paquet anomenat %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Cal un dels paquets següents:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Els paquets següents contenen %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Quina és la vostra elecció? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "La consulta de la base de dades de l'rpm ha fallat\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Elecció incorrecta, torneu-ho a provar\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -45,70 +124,100 @@ msgid ""
 msgstr ""
 "Per complir les dependències, s'instal·laran els paquets següents (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "És correcte?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "D'acord"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Si us plau, inseriu el %s anomenat %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Premeu Intro quan estigui fet..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "No es pot trobar el fitxer %s, s'està sortint"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "ja està tot instal·lat"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "s'està instal·lant %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Voleu intentar la instal·lació sense comprovar les dependències?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Voleu intentar la insta·lació encara amb més força (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Cal un dels paquets següents:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Quina és la vostra elecció? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Elecció incorrecta, torneu-ho a provar\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Dependències fallides: %s necessita %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "sintaxi: urpmi [-h] [--auto] [--force] [-a] nom_paquet [noms_paquets...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "no hi cap paquet anomenat %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Els paquets següents contenen %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "La consulta de la base de dades de l'rpm ha fallat\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "No es pot trobar el fitxer %s, s'està sortint"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Dependències fallides: %s necessita %s"
 
 #~ msgid ", exiting"
 #~ msgstr ", s'està sortint"
diff --git a/po/create_placeholder b/po/create_placeholder
new file mode 100755
index 00000000..be7ed316
--- /dev/null
+++ b/po/create_placeholder
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+cd ..
+echo -e "\
+/* this is a placeholder so that xgettext can find the translatable
+ * strings. This file is automatically generated, look at
+ * po/create_placeholder
+ */
+char *foobar[] = { " > placeholder.h.$$
+cat `grep -v placeholder.h po/POTFILES.in` | \
+	grep '$ECHO ".*"' | \
+	sed 's/^.*$ECHO \(".*"\)/N_(\1),/g' >> placeholder.h.$$
+
+for i in `grep -v placeholder.h po/POTFILES.in`
+do
+	po/pl_create_placeholder $i >> placeholder.h.$$
+done
+
+echo "};" >> placeholder.h.$$
+
+# diff returns true if files are equal
+if ! diff placeholder.h.$$ placeholder.h > /dev/null 2> /dev/null
+then
+	cat placeholder.h.$$ > placeholder.h
+fi
+rm -f placeholder.h.$$
diff --git a/po/cs.po b/po/cs.po
index 4480cb89..6a4fdef8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-05-23 18:00+0200\n"
 "Last-Translator: Vladimír Marek <vlmarek@volny.cz>\n"
 "Language-Team: czech <cs@li.org>\n"
@@ -14,32 +14,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "instaluji %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Je to správnì?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Zru¹it"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"pou¾ití: urpmi [-h] [--auto] [--force] [-a] jméno_balíèku "
-"[jména_balíèkù...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Instalovat balíky mù¾e pouze root"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "¾ádný balíèek se jménem %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Je zapotøebí jeden z následujících balíèkù:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Následující balíèky obsahují %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Jaká je Va¹e volba? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "chyba pøi hledání v rpm databázi\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Je mi líto, to je ¹patná volba. Zkuste to znovu\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -47,67 +125,98 @@ msgid ""
 msgstr ""
 "Aby byly splnìny závislosti, budou nainstalovány následující balíèky (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Je to správnì?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Zru¹it"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prosím vlo¾te %s nazvané %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "A potom stisknìte Enter..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Je mi líto, nemù¾u najít soubor %s, konèím"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "v¹e je ji¾ nainstalováno"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "instaluji %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Chyba pøi instalaci"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Mám zkusit instalaci bez kontroly závislostí?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Mám zkusit instalaci je¹tì razantnìji (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Je zapotøebí jeden z následujících balíèkù:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Jaká je Va¹e volba? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Je mi líto, to je ¹patná volba. Zkuste to znovu\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "©patné závislosti: %s vy¾aduje %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "pou¾ití: urpmi [-h] [--auto] [--force] [-a] jméno_balíèku "
+#~ "[jména_balíèkù...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "¾ádný balíèek se jménem %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Následující balíèky obsahují %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "chyba pøi hledání v rpm databázi\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Je mi líto, nemù¾u najít soubor %s, konèím"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "©patné závislosti: %s vy¾aduje %s"
diff --git a/po/da.po b/po/da.po
index 2d6c209c..463b2a7a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-05-08 00:22+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Linux Mandrake Danish Team\n"
@@ -15,30 +15,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "installerer %s\n"
+
+#: _irpm:31
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Er det ok?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Annullér"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr ""
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
-msgstr "brug: urpmi [-h] [--auto] [--force] [-a] pakke_navn [pakke_navne...]\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
 
-#: ../urpmi:56
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Kun suprebrugeren har lov til at instalere lokale pakker"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "ingen pakke med navnet %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Der er brug for en af de følgende pakker:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "De følgende pakker indeholder %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Hvad er dit valg? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm-databaseforespørgsel fejlede\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Undskyld, dårligt valg, prøv igen\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -47,67 +127,97 @@ msgstr ""
 "For at tilfredsstille afhængigheder, vil de følgende pakker blive "
 "installeret (%d Mb)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Er det ok?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Annullér"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vær venlig at indsætte %s med navnet %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Tryk på retur, når den er færdig..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Undskyld, kan ikke finde fil %s, stopper"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "alting er allerede installeret"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "installerer %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Installationen fejlede"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Prøv installation uden at tjekke afhængigheder?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Prøv installation med endnu større kraft (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Der er brug for en af de følgende pakker:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hvad er dit valg? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Undskyld, dårligt valg, prøv igen\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Afhængigheder fejlede: %s kræver %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "brug: urpmi [-h] [--auto] [--force] [-a] pakke_navn [pakke_navne...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "ingen pakke med navnet %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "De følgende pakker indeholder %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm-databaseforespørgsel fejlede\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Undskyld, kan ikke finde fil %s, stopper"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Afhængigheder fejlede: %s kræver %s"
diff --git a/po/de.po b/po/de.po
index 13813397..947d5921 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
+"Project-Id-Version: urpmi 1.5\n"
 "POT-Creation-Date: 2000-05-07 17:46+0200\n"
 "PO-Revision-Date: 2000-05-15 18:58+0200\n"
 "Last-Translator: Stefan Siegel <siegel@linux-mandrake.de>\n"
diff --git a/po/eo.po b/po/eo.po
index 3ebb5dea..0d1afcd1 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-06-01 21:50-0500\n"
 "Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -13,98 +13,207 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "instalas %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Æu tio estas bona?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Jes"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Nuligu"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"uzado: urpmi [-h] [--auto] [--force] [-a] paka¼onomo [paka¼onomoj...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Nur superuzulo rajtas instali lokajn paka¼ojn"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "paka¼o nomata %s ne ekzistas\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Unu el la sekvantaj paka¼oj estas bezonata:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "La sekvantaj paka¼oj enhavas %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Kiu estas via elekto? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm datumbaza demando malsukcesis\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Bedaýrinde, nevalida elekto, reprovu\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, 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:108
-msgid "Is it ok?"
-msgstr "Æu tio estas bona?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Jes"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Nuligu"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Bonvole enmetu la %s nomata %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Premu la enigklavon kiam øi estas finata..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Bedaýrinde ne povas trovi dosieron %s.  Eliras."
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "æio jam instalita"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "instalas %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Instalado malsukcesis"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Provu instaladon sen kontroli dependa¼ojn?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Provu instaladon eæ pli forte (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Unu el la sekvantaj paka¼oj estas bezonata:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kiu estas via elekto? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Bedaýrinde, nevalida elekto, reprovu\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Malsukcesitaj dependa¼oj: %s bezonas %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "uzado: urpmi [-h] [--auto] [--force] [-a] paka¼onomo [paka¼onomoj...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "paka¼o nomata %s ne ekzistas\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "La sekvantaj paka¼oj enhavas %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm datumbaza demando malsukcesis\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Bedaýrinde ne povas trovi dosieron %s.  Eliras."
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Malsukcesitaj dependa¼oj: %s bezonas %s"
diff --git a/po/es.po b/po/es.po
index 05e47dc4..4e189671 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 1999-08-17 16:56+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
 "Language-Team: Spanish\n"
@@ -14,32 +14,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "instalando %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "¿Está todo bien?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Aceptar"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"uso: urpmi [-h] [--auto] [--force] [-a] nombre_de_paquete "
-"[nombres_de_paquetes...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Sólo el superusuario puede instalar paquetes locales"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "ningún paquete llamado %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Uno de los paquetes siguientes es necesario:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Los paquetes siguientes contienen %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "¿Qué elige? (1-%d)"
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "falló el pedido a la base de datos de rpm\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Disculpe, elección incorrecta, reinténtelo\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -48,67 +126,98 @@ msgstr ""
 "De manera a resolver las dependencias, se instalarán los paquetes siguientes "
 "(%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "¿Está todo bien?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Inserte por favor el %s llamado %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Pulse «enter» cuando esté hecho..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Disculpe, no puedo encontrar el archivo %s, saliendo"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "ya está todo instalado"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "instalando %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "¿Intentar de instalar sin verificar las dependencias?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "¿Intentar aún más fuerte la instalación (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Uno de los paquetes siguientes es necesario:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¿Qué elige? (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Disculpe, elección incorrecta, reinténtelo\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Dependencias fallidas: %s requiere %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "uso: urpmi [-h] [--auto] [--force] [-a] nombre_de_paquete "
+#~ "[nombres_de_paquetes...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "ningún paquete llamado %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Los paquetes siguientes contienen %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "falló el pedido a la base de datos de rpm\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Disculpe, no puedo encontrar el archivo %s, saliendo"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Dependencias fallidas: %s requiere %s"
diff --git a/po/et.po b/po/et.po
index 2cee936d..5a1ee9eb 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 1999-12-11 04:18+0100\n"
 "Last-Translator: Riho Kurg <rx@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -13,99 +13,208 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "paigaldatakse %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Kas sobib?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "OK"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Katkesta"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"kasutamine: urpmi [-h] [--auto] [--force] [-a] paketi_nimi "
-"[paketi_nimed...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Ainult juurkasutaja saab lokaalseid pakette paigaldada"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "paketti %s ei leitud\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on vähemalt üks järgnevatest pakettidest:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "%s sisaldub järmistes pakettides: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Millise(d) valite? (1-%d)"
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm andmebaasi päring ebaõnnestus\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Selline valik ei ole lubatud, proovige uuesti\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, 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:108
-msgid "Is it ok?"
-msgstr "Kas sobib?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "OK"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Katkesta"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Palun pange masinasse %s nimega %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Vajutage Enter kui see on tehtud..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Ei ole võimalik leida faili %s, väljun"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "kõik on juba paigaldatud"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "paigaldatakse %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Proovin paigaldada ilma sõltuvust kontrollimata?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Proovin paigaldada veel jõulisemalt (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on vähemalt üks järgnevatest pakettidest:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Millise(d) valite? (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Selline valik ei ole lubatud, proovige uuesti\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Sõltuvuste viga: %s jaoks on vajalik %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "kasutamine: urpmi [-h] [--auto] [--force] [-a] paketi_nimi "
+#~ "[paketi_nimed...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "paketti %s ei leitud\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "%s sisaldub järmistes pakettides: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm andmebaasi päring ebaõnnestus\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Ei ole võimalik leida faili %s, väljun"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Sõltuvuste viga: %s jaoks on vajalik %s"
diff --git a/po/fi.po b/po/fi.po
index 829b015e..a3ba582a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-04-16 11:07GMT+0200\n"
 "Last-Translator: Kim Enkovaara <kim.enkovaara@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -14,98 +14,204 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.5(devel)\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "asennan %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
 msgstr ""
-"käyttö: urpmi [-h] [--auto] [--force] [-a] pakettinimi [pakettinimet...]\n"
 
-#: ../urpmi:56
-msgid "Only superuser is allowed to install local packages"
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Sopiiko tämä?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
 
-#: ../urpmi:87
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
 #, c-format
-msgid "no package named %s\n"
-msgstr "ei pakettia nimellä %s\n"
+msgid "urpmi version %s"
+msgstr ""
 
-#: ../urpmi:89
+#: urpmi:118
+msgid "Only superuser is allowed to install local packages"
+msgstr ""
+
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Yksi seuraavista paketeista tarvitaan:"
+
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Seuraavat paketit sisältävät %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Mikä on valintasi? (1-%d)"
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm tietokantahaku epäonnistui\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Virheellinen valinta, yritä uudelleen\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "Riippuvuuksien tyydyttämiseksi seuraavat paketit asennetaan (%d Mt)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Sopiiko tämä?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lisää %s nimeltään %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Paina enteriä tehtyäsi sen..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Tiedostoa %s ei löydy, lopetan"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "kaikki on jo asennettu"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "asennan %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Yritä asentaa ilman riippuvuuksia?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Yritä asentaa pakolla (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Yksi seuraavista paketeista tarvitaan:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Mikä on valintasi? (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Virheellinen valinta, yritä uudelleen\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
+
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
 msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "käyttö: urpmi [-h] [--auto] [--force] [-a] pakettinimi [pakettinimet...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "ei pakettia nimellä %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Seuraavat paketit sisältävät %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm tietokantahaku epäonnistui\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Tiedostoa %s ei löydy, lopetan"
diff --git a/po/fr.po b/po/fr.po
index 83d445c7..86a2c7c6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-09-10 02:19+0200\n"
 "Last-Translator: David BAUDENS <baudens@mandrakesoft.com>\n"
 "Language-Team: French\n"
@@ -17,33 +17,112 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+msgid "installing $rpm\n"
+msgstr "installation de $rpm\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
 msgstr ""
-"Utilisation : urpmi [-h] [--auto] [--force] [-a] nom_du_paquetage "
-"[noms_des_paquetages...]\n"
+"Installation automatique des packages...\n"
+"Vous avez demandé l'installation du paquetage $rpm\n"
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Est-ce correct ?"
 
-#: ../urpmi:56
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "OK"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Annuler"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr ""
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr ""
 "Seul l'administrateur système (root) peut installer des paquetages locaux"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "pas de paquetage nommé %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Un des paquetages suivants est nécessaire :"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Les paquetages suivants contiennent %s : %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Lequel choisissez-vous ? (1-%d)"
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "la requête sur la base de données rpm a échouée\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Désolé, mauvais choix, veuillez réessayez\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -52,67 +131,98 @@ msgstr ""
 "Pour satisfaire les dépendences, les paquetages suivants vont être installés "
 "(%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Est-ce correct ?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "OK"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Veuillez insérer le %s nommé %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Appuyez ensuite sur la touche Entrée..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Désolé impossible de trouver le fichier %s, j'abandonne"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "tout est déja installé"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "installation de %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "L'installation a échouée"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Essayer d'installer sans vérifier les dépendences ?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Essayer de forcer l'installation (--force) ?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Un des paquetages suivants est nécessaire :"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Lequel choisissez-vous ? (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Désolé, mauvais choix, veuillez réessayez\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Dépendences non satisfaites : %s nécessite %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "Utilisation : urpmi [-h] [--auto] [--force] [-a] nom_du_paquetage "
+#~ "[noms_des_paquetages...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "pas de paquetage nommé %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Les paquetages suivants contiennent %s : %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "la requête sur la base de données rpm a échouée\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Désolé impossible de trouver le fichier %s, j'abandonne"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Dépendences non satisfaites : %s nécessite %s"
diff --git a/po/ga.po b/po/ga.po
index 6696b10c..a2214b7c 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+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,98 +13,196 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "ag feistiú %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
 msgstr ""
-"úsáid: urpmi [-h] [--auto] [--force] [-a] ainm_pacáiste [ainm_pacáistí...]\n"
 
-#: ../urpmi:56
-msgid "Only superuser is allowed to install local packages"
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "An bhfuil sin Ok ?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
 msgstr ""
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "pacáiste ar bith den ainm%s\n"
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
 
-#: ../urpmi:89
-#, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Tá %s ins na pacáistí a leanas: %s \n"
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr ""
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
+#: placeholder.h:7
+msgid "urpmi is not installed"
 msgstr ""
 
-#: ../urpmi:107
+#: placeholder.h:8
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed "
-"(%d MB)"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
 msgstr ""
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "An bhfuil sin Ok ?"
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
 
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
 
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Cealaigh"
+#: urpmi:118
+msgid "Only superuser is allowed to install local packages"
+msgstr ""
 
-#: ../urpmi:159
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Tá ceann de na pacáistí seo de dhíth:"
+
+#: urpmi:168
 #, c-format
-msgid "Please insert the %s named %s"
-msgstr "Led' thoil ionchur an %s ainmnithe %s"
+msgid "What is your choice? (1-%d) "
+msgstr "Céard é do rogha? (1-%d) "
 
-#: ../urpmi:161
-msgid "Press enter when it's done..."
-msgstr "Brú Enter nuair atá sin déanta agat..."
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Droch-rogha, athtrialaigh!\n"
 
-#: ../urpmi:166
+#: urpmi:194
 #, c-format
-msgid "Sorry can't find file %s, exiting"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed "
+"(%d MB)"
 msgstr ""
 
-#: ../urpmi:175
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Led' thoil ionchur an %s ainmnithe %s"
+
+#: urpmi:221
+msgid "Press enter when it's done..."
+msgstr "Brú Enter nuair atá sin déanta agat..."
+
+#: urpmi:234
 msgid "everything already installed"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "ag feistiú %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Theip ar feistiú"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr ""
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr ""
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Céard é do rogha? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Droch-rogha, athtrialaigh!\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
+
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
+msgid "urpmq version %s"
 msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "úsáid: urpmi [-h] [--auto] [--force] [-a] ainm_pacáiste [ainm_pacáistí...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "pacáiste ar bith den ainm%s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Tá %s ins na pacáistí a leanas: %s \n"
diff --git a/po/gl.po b/po/gl.po
index affe7e7b..eccfee54 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+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,32 +14,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "instalando %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "¿Está ben?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Aceptar"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"uso: urpmi [-h] [--auto] [--force] [-a] nome_do_paquete "
-"[nomes_de_paquetes...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "non hai ningún paquete co nome %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Os seguintes paquetes conteñen %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "¿Cal é a súa elección? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "a petición á base de datos rpm fallou\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Mala elección, probe de novo\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -48,67 +126,98 @@ msgstr ""
 "Para satisfacer as dependencias, os seguintes paquetes van ser instalados "
 "(%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "¿Está ben?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor, insira o %s nomeado %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Prema enter cando estea..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Non se pode atopar o ficheiro %s, saíndo"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "xa está todo instalado"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "instalando %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "A instalación fallou"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "¿Probar a instalación sen comprobar as dependencias?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "¿Probar a instalación con menos comprobacións (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Necesítase un dos seguintes paquetes:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¿Cal é a súa elección? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Mala elección, probe de novo\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Dependencias fallidas: %s require %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "uso: urpmi [-h] [--auto] [--force] [-a] nome_do_paquete "
+#~ "[nomes_de_paquetes...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "non hai ningún paquete co nome %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Os seguintes paquetes conteñen %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "a petición á base de datos rpm fallou\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Non se pode atopar o ficheiro %s, saíndo"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Dependencias fallidas: %s require %s"
diff --git a/po/hr.po b/po/hr.po
index 4f01fa41..4e91d2db 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,8 +4,8 @@
 # Last translator: Vlatko Kosturjak <kost@iname.com>, 2000
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-12-07 11:40+CET\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -13,31 +13,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "instaliram %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Da li se sla¾ete s tim?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "U redu"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Odustani"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"uporaba: urpmi [-h] [--auto] [--force] [-a] ime_paketa [ime_paketa...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Samo administrator mo¾e instalirati lokalne pakete"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "ne postoji paket pod nazivom %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Jedan od slijedeæih paketa je potreban:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Slijedeæi paketi sadr¾e %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Izaberite jedan? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "ispitivanje (query) rpm baze nije uspjelo\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "®alim, lo¹ odabir, poku¹ajte ponovo\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -46,67 +125,97 @@ msgstr ""
 "Kako bi zadovoljili sve ovisnosti paketa slijedeæi moram instalirati "
 "slijedeæe pakete (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Da li se sla¾ete s tim?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "U redu"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Odustani"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim umetnite %s pod nazivom %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Pritisnite Enter kada ste gotovi..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "®alim nisam na¹ao datoteku %s, izlazim"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "sve je veæ instalirano"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "instaliram %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Poku¹ajte instalaciju bez provjere ovisnosti?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Poku¹ajte instalaciju jo¹ sna¾nije (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Jedan od slijedeæih paketa je potreban:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Izaberite jedan? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "®alim, lo¹ odabir, poku¹ajte ponovo\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Gre¹ka pri ovisnostima: %s zahtijeva %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "uporaba: urpmi [-h] [--auto] [--force] [-a] ime_paketa [ime_paketa...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "ne postoji paket pod nazivom %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Slijedeæi paketi sadr¾e %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "ispitivanje (query) rpm baze nije uspjelo\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "®alim nisam na¹ao datoteku %s, izlazim"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Gre¹ka pri ovisnostima: %s zahtijeva %s"
diff --git a/po/hu.po b/po/hu.po
index 15d6d486..8d7e1cee 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-05-31 22:52+0200\n"
 "Last-Translator: Csaba Szigetvári <csaba.szigetvari@informedia.hu>\n"
 "Language-Team: Informedia.hu\n"
@@ -14,31 +14,110 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "telepítés: %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Így rendben van?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "OK"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"használat: urpmi [-h] [--auto] [--force] [-a] csomagnév [csomagnevek...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Csak a superusernek engedélyezett a lokális csomagok telepítése"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "nincsen %s nevû csomag\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "A következõ csomagok közül valamelyik szükséges:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "A következõ csomagok tartalmazzák %s-t: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Mire esett a választásod? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "az rpm adatbázis pásztázása nem sikerült\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sajnálom, rossz választás, próbáld újra\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -46,67 +125,97 @@ msgid ""
 msgstr ""
 "A függõségek kielégítésére a következõ csomagok lesznek telepítve (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Így rendben van?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "OK"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ékeld be a(z) %s-t, melynek neve %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Nyomd le az Enter gombot ha kész van..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Nem található a(z) %s fájl, ezért kilépek"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "már minden telepítve van"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "telepítés: %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "A telepítés sikertelen volt"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Telepítés a függõségek ellenõrzése nélkül?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Erõltetett telepítés kísérlete (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "A következõ csomagok közül valamelyik szükséges:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Mire esett a választásod? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sajnálom, rossz választás, próbáld újra\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Megoldatlan függõségek: %s igényli a(z) %s-t"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "használat: urpmi [-h] [--auto] [--force] [-a] csomagnév [csomagnevek...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "nincsen %s nevû csomag\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "A következõ csomagok tartalmazzák %s-t: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "az rpm adatbázis pásztázása nem sikerült\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Nem található a(z) %s fájl, ezért kilépek"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Megoldatlan függõségek: %s igényli a(z) %s-t"
diff --git a/po/id.po b/po/id.po
index a6901523..cf96bf03 100644
--- a/po/id.po
+++ b/po/id.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2001-01-03 00:00+0900\n"
 "Last-Translator: Budi Rachmanto <rac@techie.com>\n"
 "Language-Team: Indonesian <rac@techie.com>\n"
@@ -13,31 +13,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "instalasi %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Semua beres?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Batal"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"cara pakai: urpmi [-h] [--auto] [--force] [-a] nama_paket [nama_paket...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Hanya superuser yang dapat meng-install paket lokal"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "tak ada paket bernama %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Salah satu paket berikut dibutuhkan:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Paket berikut berisi %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "Gagal periksa database rpm\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Salah pilih, coba lagi\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -45,67 +124,97 @@ msgid ""
 msgstr ""
 "Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Semua beres?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Batal"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Masukkan %s bernama %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Tekan [Enter] jika selesai.."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Maaf, file %s tak tertemu, keluar.."
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "semua telah terinstal"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "instalasi %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Coba instalasi tanpa cek ketergantungan?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Coba instalasi lebih keras (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Salah satu paket berikut dibutuhkan:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Pilihan Anda? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Salah pilih, coba lagi\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Problem ketergantungan: %s memerlukan %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "cara pakai: urpmi [-h] [--auto] [--force] [-a] nama_paket [nama_paket...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "tak ada paket bernama %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Paket berikut berisi %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "Gagal periksa database rpm\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Maaf, file %s tak tertemu, keluar.."
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Problem ketergantungan: %s memerlukan %s"
diff --git a/po/is.po b/po/is.po
index 139f8f71..3b072e89 100644
--- a/po/is.po
+++ b/po/is.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+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,31 +14,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "Set inn %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
 msgstr ""
-"notkun: urpmi [-h] [--auto] [--force] [-a] nafn_pakka [pakka_nöfn...]\n"
 
-#: ../urpmi:56
-msgid "Only superuser is allowed to install local packages"
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Er það í lagi?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Í lagi"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Hætta við"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
 
-#: ../urpmi:87
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
 #, c-format
-msgid "no package named %s\n"
-msgstr "Enginn '%s' pakki\n"
+msgid "urpmi version %s"
+msgstr ""
 
-#: ../urpmi:89
+#: urpmi:118
+msgid "Only superuser is allowed to install local packages"
+msgstr ""
+
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
+
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Hvað viltu? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm gagnaskrárbeiðni brást\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Slæmt val.  Reyndu aftur\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -47,67 +126,94 @@ msgstr ""
 "Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar settir inn (%d "
 "MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Er það í lagi?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Í lagi"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Hætta við"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vinsamlega settu inn %s %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Sláðu á ENTER eftirá..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Fann ekki skrána %s og hætti því"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "Allt er nú þegar komið inn"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "Set inn %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Innsetning brást"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Prófa sterkari innsetningu (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hvað viltu? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Slæmt val.  Reyndu aftur\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
+
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
 msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "notkun: urpmi [-h] [--auto] [--force] [-a] nafn_pakka [pakka_nöfn...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "Enginn '%s' pakki\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm gagnaskrárbeiðni brást\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Fann ekki skrána %s og hætti því"
diff --git a/po/it.po b/po/it.po
index aa6ad202..3a50f1b1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 1999-12-29 11:10+0100\n"
 "Last-Translator: Paolo Lorenzin <pasusu@tin.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -14,31 +14,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "sto installando %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "E' corretto?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Cancella"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"uso: urpmi [-h] [--auto] [--force] [-a] nome_pacchetto [nome_pacchetti...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Solo un superuser è abilitato ad installare pacchetti locali"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "nessun pacchettto denominato %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "E' richiesto uno dei seguenti pacchetti:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "I seguenti pacchetti contengono %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Qual'è la tua scelta? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "interrogazione database rpm fallita\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Spiacente, scelta errata, prova di nuovo\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -46,67 +125,97 @@ msgid ""
 msgstr ""
 "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti(%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "E' corretto?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Cancella"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Per favore inserisci il %s denominato %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Premi enter appena terminato..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Spiacente non trovo il file %s, uscendo"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "tutto già installato"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "sto installando %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Installazione fallita"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Provo l'installazione senza controllare le dipendenze?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Provo l'installazione ancora più forzata (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "E' richiesto uno dei seguenti pacchetti:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual'è la tua scelta? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Spiacente, scelta errata, prova di nuovo\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Dipendenze fallite: %s richiede %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "uso: urpmi [-h] [--auto] [--force] [-a] nome_pacchetto [nome_pacchetti...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "nessun pacchettto denominato %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "I seguenti pacchetti contengono %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "interrogazione database rpm fallita\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Spiacente non trovo il file %s, uscendo"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Dipendenze fallite: %s richiede %s"
diff --git a/po/ja.po b/po/ja.po
index 0cd52351..c0a08bfb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+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,99 +14,208 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ¡Ä\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "¤è¤í¤·¤¤¤Ç¤·¤ç¤¦¤«¡©"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "¤Ï¤¤¡Ê³¹Ô¤¹¤ë¡Ë"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "¤¤¤¤¤¨¡ÊÃæ»ß¤¹¤ë¡Ë"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"»ÈÍÑÊýË¡¡§urpmi [-h] [--auto] [--force] [-a] ¥Ñ¥Ã¥±¡¼¥¸Ì¾ [¥Ñ¥Ã¥±¡¼¥¸Ì¾¡Ä]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr ""
 "¥í¡¼¥«¥ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¡¼¤Ç¤Ê¤¯¤Æ¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "%s ¤È¤¤¤¦¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤¤¤º¤ì¤«¤¬É¬ÍפǤ¹:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "%s ¤Ï¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "¤É¤ì¤òÁª¤Ó¤Þ¤¹¤«¡©(1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Í­¸ú¤ÊÁªÂò¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤â¤¦°ìÅÙ¤ª´ê¤¤¤·¤Þ¤¹\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "°Í¸´Ø·¸¤Î¤¿¤á¡¢¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹ (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "¤è¤í¤·¤¤¤Ç¤·¤ç¤¦¤«¡©"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "¤Ï¤¤¡Ê³¹Ô¤¹¤ë¡Ë"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "¤¤¤¤¤¨¡ÊÃæ»ß¤¹¤ë¡Ë"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "%2$s ¤È¤¤¤¦Ì¾Á°¤Î %1$s ¤òÁÞÆþ¤·¤Æ²¼¤µ¤¤¡£"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "½ª¤ï¤Ã¤¿¸å¤Ï¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤¡£"
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "%s ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£¤³¤Î¤Þ¤Þ½ªÎ»¤·¤Þ¤¹"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "¤¹¤Ù¤Æ´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ¡Ä\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "°Í¸´Ø·¸¤ò¹Í褻¤º¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ò¤·¤Æ¤ß¤Þ¤¹¤«¡©"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "¤µ¤é¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ò»î¤ß¤Þ¤¹¤«¡©¡Ê--force ¥ª¥×¥·¥ç¥óÁêÅö¤Ç¤¹¡Ë"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤¤¤º¤ì¤«¤¬É¬ÍפǤ¹:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¤É¤ì¤òÁª¤Ó¤Þ¤¹¤«¡©(1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Í­¸ú¤ÊÁªÂò¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤â¤¦°ìÅÙ¤ª´ê¤¤¤·¤Þ¤¹\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "°Í¸Âоݤ¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿: %s ¤Ï %s ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "»ÈÍÑÊýË¡¡§urpmi [-h] [--auto] [--force] [-a] ¥Ñ¥Ã¥±¡¼¥¸Ì¾ [¥Ñ¥Ã¥±¡¼¥¸Ì¾¡Ä]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "%s ¤È¤¤¤¦¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "%s ¤Ï¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "%s ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£¤³¤Î¤Þ¤Þ½ªÎ»¤·¤Þ¤¹"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "°Í¸Âоݤ¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿: %s ¤Ï %s ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹"
diff --git a/po/ka.po b/po/ka.po
index e1a8d3dd..0467f3ff 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
+"Project-Id-Version: urpmi 1.5\n"
 "POT-Creation-Date: 2000-05-07 17:46+0200\n"
 "PO-Revision-Date: 2000-05-15 18:58+0200\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>, 2000\n"
diff --git a/po/lt.po b/po/lt.po
index fcb6f3e0..545b072e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-09-30 09:40+0200\n"
 "Last-Translator: Kæstutis Kruþikas <DrKestas@takas.lt>\n"
 "Language-Team: Lithuanian\n"
@@ -13,99 +13,208 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "ádiegiamas %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "ar taip gerai?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Gerai"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Nutraukti"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"vartojimas: urpmi [-h] [--auto] [--force] [-a] paketo_pavadinimas "
-"[paketo_pavadinimai...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Tik root vartotojas gali ádiegti vietinius paketus"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "nëra paketo su tokiu pavadinimu %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Vienas ið ðiø paketø yra reikalingas."
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Ðiuose paketuose yra %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Koks Jûsø pasirinkimas? (1-%d)"
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm duomenø bazës patikrinimas nepavyko\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atsipraðau, blogas pasirinkimas, pakartokit\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, 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:108
-msgid "Is it ok?"
-msgstr "ar taip gerai?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Gerai"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Nutraukti"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Praðome ákiðti %s, pavadintà %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Praðome spausti 'enter', kada bus baigta..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Atsipraðau, nerandu bylos %s, iðeinu"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "viskas ir taip jau ádiegta"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "ádiegiamas %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Ádiegimas nepavyko"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Pabandyti ádiegimà be priklausomybiø tikrinimo?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Pabandyti ádiegimà priverstinai (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Vienas ið ðiø paketø yra reikalingas."
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Koks Jûsø pasirinkimas? (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atsipraðau, blogas pasirinkimas, pakartokit\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Nepavykusi priklausomybë: %s reikia %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "vartojimas: urpmi [-h] [--auto] [--force] [-a] paketo_pavadinimas "
+#~ "[paketo_pavadinimai...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "nëra paketo su tokiu pavadinimu %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Ðiuose paketuose yra %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm duomenø bazës patikrinimas nepavyko\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Atsipraðau, nerandu bylos %s, iðeinu"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Nepavykusi priklausomybë: %s reikia %s"
diff --git a/po/lv.po b/po/lv.po
index 7bfec9c1..a9afc64a 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-09-08 21:30+0200\n"
 "Last-Translator: Vitauts Stochka <vit@dpu.lv>\n"
 "Language-Team: Latvian\n"
@@ -14,99 +14,208 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "tiek instalçta %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Vai piekrîtat tam?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Atsaukt"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"izmantoðana: urpmi [-h] [--auto] [--force] [-a] pakotnes_nos "
-"[pakotnes_nos...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Tikai root drîkst instalçt lokâlâs pakotnes"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "nav pakotnes ar nosaukumu %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Sekojoðas pakotnes satur %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Kâda ir jûsu izvçle? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm datubâzes pârbaude bija neveiksmîga\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atvainojiet, nepareiza izvçle. Mçìiniet vçlreiz\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, 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:108
-msgid "Is it ok?"
-msgstr "Vai piekrîtat tam?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Atsaukt"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lûdzu ielieciet %s ar nosaukumu %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Nospiediet ievada taustiòu, kad tas izdarîts..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Diemþçl neizdodas atrast failu %s, pârtraucu"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "viss jau ir instalçts"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "tiek instalçta %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Instalçðana neizdevâs"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Vai mçìinât instalçt bez atkarîbu pârbaudes?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Vai mçìinât instalçt vçl uzstâjîgâk (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kâda ir jûsu izvçle? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atvainojiet, nepareiza izvçle. Mçìiniet vçlreiz\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Atkarîbu kïûda: priekð %s ir nepiecieðama %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "izmantoðana: urpmi [-h] [--auto] [--force] [-a] pakotnes_nos "
+#~ "[pakotnes_nos...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "nav pakotnes ar nosaukumu %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Sekojoðas pakotnes satur %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm datubâzes pârbaude bija neveiksmîga\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Diemþçl neizdodas atrast failu %s, pârtraucu"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Atkarîbu kïûda: priekð %s ir nepiecieðama %s"
diff --git a/po/nl.po b/po/nl.po
index 2a6e836a..1e9523b4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-09-18 23:40+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-09-18 23:40+0200\n"
 "Last-Translator: NIELS GRAS <niels.gras@wanadoo.nl>\n"
 "Language-Team: Dutch\n"
@@ -14,31 +14,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "bezig met installeren van %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Is het goed?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"gebruik: urpmi [-h] [--auto] [--force] [-a] archief_naam [archief_namen...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Alleen de superuser kan locale archieven installeren"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "geen archief genaamd %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Een van de volgende archieven is benodigd:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "De volgende archieven bevatten %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Wat is uw keuze? (1-%d)"
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm database query mislukt\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sorry, foute keuze, probeer een andere\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -47,67 +126,97 @@ msgstr ""
 "Om dependencies te gebruiken, worden de volgende archieven geïnstalleerd (%d "
 "MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Is het goed?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Voeg a.u.b. de %s genaamd %s in"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Druk op enter wanneer het klaar is..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Sorry, kan het bestand %s niet vinden, bezig met afsluiten"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "alles is al geïnstalleerd"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "bezig met installeren van %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Installatie mislukt"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Proberen te installeren zonder de dependencies te controleren?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Installatie forceren (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Een van de volgende archieven is benodigd:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Wat is uw keuze? (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sorry, foute keuze, probeer een andere\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Dependencies mislukt: %s heeft %s nodig"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "gebruik: urpmi [-h] [--auto] [--force] [-a] archief_naam [archief_namen...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "geen archief genaamd %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "De volgende archieven bevatten %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm database query mislukt\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Sorry, kan het bestand %s niet vinden, bezig met afsluiten"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Dependencies mislukt: %s heeft %s nodig"
diff --git a/po/no.po b/po/no.po
index b54124e2..7dbc0cd8 100644
--- a/po/no.po
+++ b/po/no.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 1999-12-18 17:33+0100\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: Norwegian\n"
@@ -13,30 +13,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "installerer %s\n"
+
+#: _irpm:31
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Er det ok?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr ""
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
-msgstr "bruk: urpmi [-h] [--auto] [--force] [-a] pakkenavn [pakkenavn...]\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
 
-#: ../urpmi:56
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Bare superbruker har adgang til å installere lokale pakker"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "ingen pakker kalt %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "En av følgende pakker behøves:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Følgende pakker inneholder %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Hva er ditt valg? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm databaseforespørsel mislykket\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Beklager, dårlig valg, prøv igjen\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -44,67 +124,96 @@ msgid ""
 msgstr ""
 "Følgende pakker vil bli installert for å tilfredstille avhengigheter (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Er det ok?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vennligst sett inn %s kalt %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Trykk enter når det er ferdig..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Beklager, kan ikke finne fil %s, avslutter"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "alt er allerede installert"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "installerer %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Installasjon mislykket"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Prøve å installere uten å sjekke avhengigheter?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Prøve å installere enda hardere (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "En av følgende pakker behøves:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hva er ditt valg? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Beklager, dårlig valg, prøv igjen\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Mislykkede avhengigheter: %s trenger %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr "bruk: urpmi [-h] [--auto] [--force] [-a] pakkenavn [pakkenavn...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "ingen pakker kalt %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Følgende pakker inneholder %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm databaseforespørsel mislykket\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Beklager, kan ikke finne fil %s, avslutter"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Mislykkede avhengigheter: %s trenger %s"
diff --git a/po/pl.po b/po/pl.po
index 09fba6e8..8cc4b6d8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,8 +3,8 @@
 # Pawel Jablonski <pj@linux-mandrake.com>, 1999-2000.
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-09-08 12:48:03+0200\n"
 "Last-Translator: Pawel Jablonski <pj@linux-mandrake.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -13,32 +13,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.5.0\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "instalowanie %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "W porz±dku?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "OK"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"u¿ycie: urpmi [-h] [--auto] [--force] [-a] nazwa_pakietu "
-"[nazwy_pakietów...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Tylko root ma prawo instalowaæ pakiety lokalne"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "brak pakietu o nazwie %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Potrzebny jest jeden z nastêpuj±cych pakietów:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Nastêpuj±ce pakiety zawieraj± %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Jaki jest Twój wybór? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "zapytanie bazy rpm nie powiod³o siê\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Niestety, z³y wybór, spróbuj ponownie\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -47,67 +125,98 @@ msgstr ""
 "Zostan± zainstalowane nastêpuj±ce pakiety w celu spe³nienia zale¿no¶ci (%d "
 "MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "W porz±dku?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "OK"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Proszê w³o¿yæ %s o nazwie %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Naci¶nij enter, gdy to zrobisz..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Niestety nie mogê znale¼æ pliku %s, koñczê dzia³anie"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "wszystko jest ju¿ zainstalowane"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "instalowanie %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Instalacja nie powiod³a siê"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Próbowaæ instalowaæ bez sprawdzania zale¿no¶ci?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Próbowaæ wymusiæ instalacjê (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Potrzebny jest jeden z nastêpuj±cych pakietów:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Jaki jest Twój wybór? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Niestety, z³y wybór, spróbuj ponownie\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "B³±d zale¿no¶ci: %s wymaga %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "u¿ycie: urpmi [-h] [--auto] [--force] [-a] nazwa_pakietu "
+#~ "[nazwy_pakietów...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "brak pakietu o nazwie %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Nastêpuj±ce pakiety zawieraj± %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "zapytanie bazy rpm nie powiod³o siê\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Niestety nie mogê znale¼æ pliku %s, koñczê dzia³anie"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "B³±d zale¿no¶ci: %s wymaga %s"
diff --git a/po/pl_create_placeholder b/po/pl_create_placeholder
new file mode 100755
index 00000000..3a34cbdb
--- /dev/null
+++ b/po/pl_create_placeholder
@@ -0,0 +1,508 @@
+#!/usr/bin/perl
+
+# modified xplgettext from perl-gettext (pablo)
+
+# this program extracts internationalizable strings from a perl program.
+
+# forward declaration of subroutines.
+sub unescapeDQString;
+sub replaceString($$$$);
+sub doWarn($$);
+sub displayHelp();
+sub doNotify($);
+
+
+# we do the option handling first.
+use Getopt::Long;
+Getopt::Long::config("no_ignore_case", 
+                     "no_auto_abbrev", 
+                     "require_order",
+                     "bundling");
+# since get options doesn't seem to handle '-' as option well,
+# we'll preprocess here
+foreach $i (0 ... $#ARGV)
+{
+   if($opt eq '-')
+   {
+      $ARGV[$i] = '__stdin__';
+   }
+}
+
+if(!GetOptions(\%opts,
+#           'default-domain|d=s',
+#           'directory|D=s',
+#           'no-escape|e',
+#           'escape|E',
+#           'files-from=s',
+#           'sort-by-file|F',
+#           'help|h',
+#           'indent|i',
+#           'join-existing|j',
+#           'keyword|k:s@',
+#           'string-limit|l=i',
+#           'msgstr-prefix|m:s',
+#           'msgstr-suffix|M:s',
+#           'no-location',
+#           'add-location|n',
+#           'omit-header',
+#           'sort-output|s',
+#           'strict',
+           'verbose|v',
+#           'version|V',
+#           'exclude-file|x=s'
+           ) || defined($opts{"help"}))
+{
+   displayHelp;
+}
+
+# check if we have any file names to deal with.
+if($#ARGV == -1)
+{
+   doWarn 1, 'File name not specified.  Standard in is used instead.';
+   push @ARGV, '__stdin__';
+}
+
+
+# keeps track of the state of the parser.  basically means what we are 
+# looking for next.
+$state = 'func_head';
+
+# initialize the text temporarry strage.
+$text = "";
+
+# repeat for all the lines.
+for($i = 0; $i <= $#ARGV; $i++)
+{
+   # this keeps track of the line number.
+   $linenum = 0;
+
+   # open the file.  we take '__stdin__' as standard in.
+   $ARGV[$i] = '-' if $ARGV[$i] eq '__stdin__';
+   if(!open(IN, "< $ARGV[$i]"))
+   {
+      # failed to open the file.
+      doWarn 0, "Failed to open input file $ARGV[$i].";
+      next;
+   }
+   doNotify "File $ARGV[$i] opened.";
+
+   # keep track of the files successfully opened.
+   push @files, $ARGV[$i];
+
+   while(<IN>)
+   {
+      $linenum++;
+   
+      # discard the comment lines.
+      if(/^\s*\#/)
+      {
+         next;
+      }
+   
+      # our assumption is that 'I_(' won't appear anywhere other than where 
+      # internationalizable text is being marked.
+      chop;
+      $line = $_;
+      while ($line)
+      {
+         if($state eq 'func_head')
+         {
+            # this means we are looking for the beginning of funciton call.
+            #if($line =~ s/.*?I\_\(//)
+            if($line =~ s/.*?\_\(//)
+            {
+               $state = 'quote_begin';
+               next;
+            }
+
+            # nothing interesting in this line.
+            last;
+         }
+   
+         elsif($state eq 'quote_begin')
+         {
+            # we are looking for left quote.  there can be two of them.
+            if($line =~ s/^\s*([\"\'])//)
+            {
+               # this has to happen.  check what kind of quoting we have.
+               $start_line = $linenum;
+               if($1 eq '"')
+               {
+                  $state = 'dq_text';
+               }
+               else
+               {
+                  $state = 'sq_text';
+               }
+            }
+            else
+            {
+               # otherwise, this is something we can't handle.
+               doWarn 1, "Unrecognizable expression within I_" .
+                            " function call. (line: $linenum)";
+               $state = 'dynamic_text';
+            }
+   
+            # lines can't end in this state.
+            next;
+         }
+   
+         elsif($state eq 'dq_text')
+         {
+            # we are only interested in another double quote which is not
+            # preceded by a back slash.
+            if($line =~ s/(.*?)\"//)
+            {
+               # check if we have a back slash preceding it.
+               $t = $1;
+               if($t =~ /\\$/)
+               {
+                  # the double quote was within the string still.
+                  $text .= unescapeDQString($t + '"');
+               }
+               else
+               {
+                  # end of the string.
+                  $text .= unescapeDQString($t);
+                  $state = 'end_text';
+               }
+               next;
+            }
+
+            # all this line is the string.
+            $text .= unescapeDQString($line . '\n');
+            last;
+         }
+   
+         elsif($state eq 'sq_text')
+         {
+            # we are only interested in another single quote which is not 
+            # preceded by a back slash.
+            if($line =~ s/(.*?)\'//)
+            {
+               # check if we have a back slash preceding it.
+               $t = $1;
+               if($t =~ s/\\$//)
+               {
+                  # the single quote was still in the string.
+                  $text .= unescapeDQString($t + "'");
+               }
+               else
+               {
+                  # end of the string.
+                  $text .= unescapeDQString($t);
+                  $state = 'end_text';
+               }
+               next;
+            }
+
+            # all this line is the string.
+            $text .= unescapeDQStrig($line . '\n');
+            last;
+         }
+   
+         elsif($state eq 'dynamic_text')
+         {
+            # we can't really handle this situation, so we'll look for
+            # a close pharenthy to return to the normal state.
+            if($line =~ s/.*?\)//)
+            {
+               # we can go back to the normal state.
+               $state = 'func_head';
+               next;
+            }
+
+            # we have to find the close pharenthy to go
+            # back to the normal state.
+            last;
+         }
+   
+         elsif($state eq 'end_text')
+         {
+            # we allow only period to appear between strings.
+            if($line =~ s/^\s*([\.\)])//)
+            {
+               # check what we've got.
+               if($1 eq '.')
+               {
+                  # another string should be comming.
+                  $state = 'quote_begin';
+               }
+               else
+               {
+                  # we ended the function call.
+                  $state = 'func_head';
+   
+                  # check if the string is a valid one.
+                  if($text eq "")
+                  {
+                     # we don't accept null strings.
+                     doWarn 1, "Null string appeared. (line: $linenum)";
+                  }
+                  else
+                  {
+                     # check if this string has appeared before.
+                     if(exists($msgs{$text}))
+                     {
+                        # it does exit.
+                        $msgs{$text} .= " $ARGV[$i]:$start_line";
+                     }
+                     else
+                     {
+                        # first time.
+                        $msgs{$text} = "$ARGV[$i]:$start_line";
+                     }
+                     $text = "";
+                  }
+               }
+               next;
+            }
+            else
+            {
+               # something weird follows the text.
+               # in this case, we ignore the string processed too.
+               doWarn 1, 'Unrecognizable expression within I_' .
+                            " function call. (line: $linenum)";
+               $text = "";
+               $state = 'dynamic_text';
+               next;
+            }
+         }
+   
+         else
+         {
+            # this should not happen.
+            doWarn 2, "Unknown state $state.";
+            last;
+         }
+
+         # end of while loop for state processing.
+      }
+      # end of while loop for input lines.
+   }
+   # end of for loop for input files.
+} 
+
+
+# we should have all the data we need now.
+# output the message file.
+if(!open(OUT, ">&STDOUT"))
+{
+   doWarn 0, 'Failed to open file placeholder.h.';
+   exit(0);
+}
+
+# go through all the strings gathered.
+foreach $msgid (keys(%msgs))
+{
+   # we find out if the text has to be split into lines.
+   $#lines = - 1;
+   while($msgid =~ /(.*?\\n)/gc)
+   {
+      push @lines, $1;
+   }
+   if(pos($msgid) < length($msgid))
+   {
+      # we have another line.
+      push @lines, substr($msgid, pos($msgid));
+   }
+
+   # check how many lines we have.
+   if($#lines == 0)
+   {
+# only multiline aren't found by xgettext
+      # one line format.
+      #print OUT "N_(\"$lines[0]\"),\n";
+   }
+   else
+   {
+      # multi-line format.
+      print OUT "N_(\"\"\n";
+      foreach $line (@lines)
+      {
+         print OUT "\"$line\"\n"
+      }
+      print OUT "\"\"),\n";
+   }
+}
+
+
+# successfully completed the mission.
+exit 0;
+
+
+######################################################################
+# helper funciton section
+######################################################################
+
+# this function has to return a value, so it doesn't deserve
+# the statement style call, and therefore doesn't deserve prototype.
+sub unescapeDQString
+{
+   my $str = shift;
+
+   # check all the back slashes.
+   while($str =~ /\\/g)
+   {
+      # we found a back slash.  let's check what the following
+      # character is.
+      my $char = substr($str, pos($str));
+
+      if($char eq '')
+      {
+         # since we assume one call of this function is for one
+         # complete string (term in string expression), we
+         # assume we don't have to worry about escape sequences
+         # span multiple calls.
+         
+         # it was the last character in the string.  this shouldn't
+         # happen, but we respect the back slash.
+         doWarn 2, "Back slash found at the end of string. (line: $lnenum)";
+         $str .= '\\';
+         last;
+      }
+
+      elsif($char =~ /^([tn]|[0-8][0-8][0-8])/)
+      {
+         # valid sequence.  no problem.
+         next;
+      }
+
+      elsif($char =~ /^[rfb]/)
+      {
+         # we warn, and use them as is.
+         doWarn 1, "International string sholdn't contain \\$&.";
+         next;
+      }
+
+      elsif($char =~ /^[ae]/)
+      {
+         # we warn, and convert.
+         doWarn 1, "International string shouldn't contain \\$&.";
+         replaceString \$str, $& eq 'a' ? '007' : '033', 0, 1;
+         next;
+      }
+
+      elsif($char =~ /^x([0-9a-fA-F][0-9a-fA-F])/)
+      {
+         # here, we do the conversion silently.
+         replaceString \$str, sprintf("%03o", hex($1)), 0, 3;
+         next;
+      }
+
+      elsif($char =~ /^c(.)/)
+      {
+         # we warn, and convert.
+         doWarn 1, "International string shouldn't contain \\$&.";
+         my $ctrl = ord($1) - 64;
+         if($ctrl < 255 || $ctrl < 0)
+         {
+            doWarn 1, "Unrecognizable control sequence \\$&.";
+            next;
+         }
+         replaceString \$str, sprintf("%03o", $ctrl), 0, 2;
+         next;
+      }
+
+      elsif($char =~ /^[luLUEQ]/)
+      {
+         # perl special escape sequences.
+         # we'll let them keep the slashes.
+         replaceString \$str, '\\', 0, 0;
+         next;
+      }
+
+      else
+      {
+         # in all other cases, the slash needs to be discarded.
+         replaceString \$str, '', -1, 1;
+         next;
+      }
+      # end of while loop for slashes.
+   }
+
+   # return value is the converted string.
+   $str;
+}
+
+
+# this one replaces a part of string in the specified position.
+# it also sets the search position to the end of the replaced substring.
+# the arguments are
+#     - reference of the target string
+#     - replacement text
+#     - starting position of the substring replaced (relative to pos)
+#     - length of the substring replaced
+sub replaceString($$$$)
+{
+   my $str_ref     = shift;
+   my $replace_str = shift;
+   my $del_start   = shift;
+   my $num_del     = shift;
+
+   my $p = pos($$str_ref);
+   $$str_ref = substr($$str_ref, 0, $p + $del_start) . 
+              $replace_str .
+              substr($$str_ref, $p + $del_start + $num_del);
+
+   # adjust the search position.
+   pos($$str_ref) = $p + $del_start + length($replace_str);
+}
+
+
+# sends warning to standard error.  the first argument is for the
+# warning level:
+#     0: critical - always show
+#     1: warning  - show if verbose
+#     2: bug      - shouldn't happen
+# the second argument is the message to be displayed.
+sub doWarn($$)
+{
+   my $level   = shift;
+   my $message = shift;
+
+   if($level == 0)
+   {
+      # critical error.
+      warn "ERROR:  " . $message . "\n";
+   }
+
+   elsif($level == 1)
+   {
+      # warning. 
+      warn "WARNING:  " . $message . "\n" if exists($opts{"verbose"});
+   }
+
+   elsif($level == 2)
+   {
+      # programming error (of plxgettext).
+      warn "BUG:  " . $message . "\n";
+   }
+
+   else
+   {
+      # shouldn't happen.  let's do a recursive call.
+      doWarn 2, 'Invalid warning level specified.';
+   }
+}
+
+
+# tell user what we are doing.
+sub doNotify($)
+{
+   my $msg = shift;
+
+   if(!defined($opts{"verbose"}))
+   {
+      # nothing we can do.
+      return;
+   }
+
+   print $msg . "\n";
+}
+
+
+# show the help message.
+sub displayHelp()
+{
+}
diff --git a/po/pt.po b/po/pt.po
index ff5db57c..ec9b524b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 1999-08-17 16:56+0200\n"
 "Last-Translator: Fernando Moreira <fmoreira@netc.pt>\n"
 "Language-Team: Portuguese\n"
@@ -14,32 +14,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "A instalar %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Está bem assim?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Aceitar"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"Utilização: urpmi [-h] [--auto] [--force] [-a] nome_do_pacote "
-"[nome_dos_pacotes...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Apenas o SuperUtilizador pode instalar pacotes localmente"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "Nenhum pacote com o nome %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Um dos seguintes pacotes é necessário:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Os seguintes pacotes incluem %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Qual é a sua escolha? (1-%d)"
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "Falhou a consulta à base de dados rpm\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, opção incorreta, tente de novo\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -48,67 +126,98 @@ msgstr ""
 "Por forma a resolver as dependências, instalar-se-ão os siguientes pacotes "
 "(%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Está bem assim?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Aceitar"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Insira por favor o %s chamado %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Prima «Enter» quando concluir..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Desculpe, não foi possível localizar o ficheiro %s, a sair..."
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "Já está tudo instalado"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "A instalar %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "A Instalação Falhou"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Tentar instalação sem verificar dependências?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Tentar instalação ainda mais insistentemente (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Um dos seguintes pacotes é necessário:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual é a sua escolha? (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, opção incorreta, tente de novo\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Fallaram dependencias: %s requere %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "Utilização: urpmi [-h] [--auto] [--force] [-a] nome_do_pacote "
+#~ "[nome_dos_pacotes...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "Nenhum pacote com o nome %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Os seguintes pacotes incluem %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "Falhou a consulta à base de dados rpm\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Desculpe, não foi possível localizar o ficheiro %s, a sair..."
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Fallaram dependencias: %s requere %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 21f1312f..a412c870 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-10-13 20:09-0300\n"
 "Last-Translator: Andrei Bosco Bezerra Torres <andreibt@uol.com.br>\n"
 "Language-Team: Português Brasileiro\n"
@@ -13,32 +13,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "instalando %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Tudo bem?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"utilização: urpmi [-h] [--auto] [--force] [-a] nome_do_pacote "
-"[nome_dos_pacotes...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Apenas um super-usuário tem permissão para instalar pacotes locais"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "nenhum pacote chamado %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Um dos pacotes a seguir é necessário:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Os seguintes pacotes contêm %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Qual é a sua escolha? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "pesquisa do banco de dados rpm falhou\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, má escolha, tente novamente\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -47,67 +125,98 @@ msgstr ""
 "Para satisfazer as dependências, os seguintes pacotes irão ser instalados "
 "(%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Tudo bem?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Favor inserir o %s chamado %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Aperte enter quando estiver pronto..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Desculpe, não pude encontrar o arquivo %s, saindo"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "tudo já instalando"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "instalando %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Instalação falhou"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Tentar instalar sem checar as dependências?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Tentar instalar com ainda mais força (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Um dos pacotes a seguir é necessário:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual é a sua escolha? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, má escolha, tente novamente\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "As dependências falharam: %s requer %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "utilização: urpmi [-h] [--auto] [--force] [-a] nome_do_pacote "
+#~ "[nome_dos_pacotes...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "nenhum pacote chamado %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Os seguintes pacotes contêm %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "pesquisa do banco de dados rpm falhou\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Desculpe, não pude encontrar o arquivo %s, saindo"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "As dependências falharam: %s requer %s"
diff --git a/po/ro.po b/po/ro.po
index 58355702..c8d44316 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-04-29 12:05+0100\n"
 "Last-Translator: Florin Grad <florin@mandrakesoft.com>\n"
 "Language-Team: Romanian\n"
@@ -14,31 +14,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "instalez %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "E ok?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Anuleazã"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"utilizare: urpmi [-h] [--auto] [--force] [-a] nume_pachet [nume_pachete...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Doar superutilizatorul poate instala pachetele locale"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "nici un pachet cu numele %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Unul din urmãtoarele pachete e necesar:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Urmãtoarele pachete conþin %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Ce alegeþi? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "examinarea bazei de date rpm a eºuat\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Aþi ales greºit, încercaþi din nou\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -46,67 +125,97 @@ msgid ""
 msgstr ""
 "Pentru a satisface dependenþele, urmãtoarele pachete vor fi instalate (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "E ok?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Anuleazã"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vã rog  introduceþi %s cu numele %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Apãsaþi enter cînd e gata..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Nu pot sã gãsesc fiºierul %s, termin"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "totul e deja instalat"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "instalez %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Instalarea a eºuat"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Încearcã instalarea fãrã verificarea dependenþelor?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Încearcã instalarea încã ºi mai dur (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Unul din urmãtoarele pachete e necesar:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ce alegeþi? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Aþi ales greºit, încercaþi din nou\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Eroare de dependinþe: %s necesitã %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "utilizare: urpmi [-h] [--auto] [--force] [-a] nume_pachet [nume_pachete...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "nici un pachet cu numele %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Urmãtoarele pachete conþin %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "examinarea bazei de date rpm a eºuat\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Nu pot sã gãsesc fiºierul %s, termin"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Eroare de dependinþe: %s necesitã %s"
diff --git a/po/ru.po b/po/ru.po
index 2a8dd7f2..adc05041 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-08-01 16:24+0200\n"
 "Last-Translator: Aleksey Smirnov <smi@logic.ru>\n"
 "Language-Team: Russian\n"
@@ -13,31 +13,110 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "ÕÓÔÁÎÏ×ËÁ %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "ÐÒÁ×ÉÌØÎÏ?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "ïÔÍÅÎÉÔØ"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"ÎÁÂÒÁÔØ: urpmi [-h] [--auto] [--force] [-a] ÉÍÑ_ÐÁËÅÔÁ [ÉÍÅÎÁ_ÐÁËÅÔÏ×...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "ôÏÌØËÏ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÖÅÔ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÌÏËÁÌØÎÙÅ ÐÁËÅÔÙ"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "ÐÁËÅÔÙ ÎÅ ÎÁÚ×ÁÎÙ %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "üÔÉ ÐÁËÅÔÙ ÓÏÄÅÒÖÁÔ %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "þÔÏ ×Ù ×ÙÂÅÒÅÔÅ? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "ÚÁÐÒÏÓ Ë ÂÁÚÅ rpm ÎÅ ÐÒÏÛÅÌ \n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "ðÌÏÈÏÊ ×ÙÂÏÒ, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -45,67 +124,97 @@ msgid ""
 msgstr ""
 "äÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÂÕÄÕÔ ÕÓÔÁÎÏ×ÌÅÎÙ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "ÐÒÁ×ÉÌØÎÏ?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "ïÔÍÅÎÉÔØ"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "÷ÓÔÁ×ØÔÅ %s ÐÏÄ ÎÁÚ×ÁÎÉÅÍ %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "ðÏ ÇÏÔÏ×ÎÏÓÔÉ ÎÁÖÍÉÔÅ enter..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ %s, ×ÙÈÏÖÕ"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "×ÓÅ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÏ"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "ÕÓÔÁÎÏ×ËÁ %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "õÓÔÁÎÏ×ËÁ ÎÅ ÐÒÏÛÌÁ"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "ðÏÐÒÏÂÏ×ÁÔØ ÕÓÔÁÎÏ×ÉÔØ ÂÅÚ ÐÒÏ×ÅÒËÉ ÚÁ×ÉÓÉÍÏÓÔÅÊ?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "ðÏÐÒÏÂÏ×ÁÔØ ÕÓÔÁÎÏ×ÉÔØ ÅÝÅ ÂÏÌÅÅ ÎÁÓÔÏÊÞÉ×Ï (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "þÔÏ ×Ù ×ÙÂÅÒÅÔÅ? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "ðÌÏÈÏÊ ×ÙÂÏÒ, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "ïÛÉÂËÁ ÚÁ×ÉÓÉÍÏÓÔÅÊ %s ÔÒÅÂÕÅÔ %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "ÎÁÂÒÁÔØ: urpmi [-h] [--auto] [--force] [-a] ÉÍÑ_ÐÁËÅÔÁ [ÉÍÅÎÁ_ÐÁËÅÔÏ×...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "ÐÁËÅÔÙ ÎÅ ÎÁÚ×ÁÎÙ %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "üÔÉ ÐÁËÅÔÙ ÓÏÄÅÒÖÁÔ %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "ÚÁÐÒÏÓ Ë ÂÁÚÅ rpm ÎÅ ÐÒÏÛÅÌ \n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ %s, ×ÙÈÏÖÕ"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "ïÛÉÂËÁ ÚÁ×ÉÓÉÍÏÓÔÅÊ %s ÔÒÅÂÕÅÔ %s"
diff --git a/po/sk.po b/po/sk.po
index 782ce537..5a768d7b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-05-016 09:52+0100\n"
 "Last-Translator: Jan Matis <damned@hq.alert.sk>\n"
 "Language-Team: sk <i18n@hq.alert.sk>\n"
@@ -15,32 +15,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "in¹talujem %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Je to v poriadku?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Zru¹"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"pou¾itie : urpmi [-h] [--auto] [--force] [-a] názov_balíka "
-"[názvy_balíkov...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "In¹talova» balíky má dovolené jedine root"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "¾iadny balík s názvom %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Jeden z nasledujúcich balíkov je potrebný:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Nasledujúce balíky obsahujú %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Vá¹ výber? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "po¾iadavka na rpm databázu zlyhala\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Prepáète, zlá voµba, skúste znova\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -49,69 +127,100 @@ msgstr ""
 "Kvôli zachovaniu závislostí, by mali by» nain¹talované nasledujúce balíky "
 "(%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Je to v poriadku?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Zru¹"
-
 # **************fix me****************
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prosím vlo¾te %s nazvaný %s"
 
 # ******************fix me***********
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Po ukonèení stlaète enter..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Prepáète, nemô¾em nájs» súbor %s, konèím"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "v¹etko je u¾ nain¹talované"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "in¹talujem %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "In¹talácia zlyhala"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Skúsi» in¹taláciu bez kontroly závislostí?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Skúsi» \"tvrd¹iu\" in¹taláciu (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Jeden z nasledujúcich balíkov je potrebný:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Vá¹ výber? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Prepáète, zlá voµba, skúste znova\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Zlyhanie závislostí: %s potrebuje %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "pou¾itie : urpmi [-h] [--auto] [--force] [-a] názov_balíka "
+#~ "[názvy_balíkov...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "¾iadny balík s názvom %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Nasledujúce balíky obsahujú %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "po¾iadavka na rpm databázu zlyhala\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Prepáète, nemô¾em nájs» súbor %s, konèím"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Zlyhanie závislostí: %s potrebuje %s"
diff --git a/po/sp.po b/po/sp.po
index 8043904a..56c326c4 100644
--- a/po/sp.po
+++ b/po/sp.po
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-04-20 19:20+0100\n"
 "Last-Translator: Tomislav Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian(Cyrillic) <come.to@Linux-YU>\n"
@@ -15,98 +15,207 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "¸ÝáâÐÛØàÐÜ %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "´Ð ÛØ øÕ ¾K ?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "¾K"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "¿ÞÝØèâØ"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"¿ÞáâãßÐÚ: urpmi [-h] [--auto] [--force] [-a] ØÜÕ_ßÐÚÕâÐ [ØÜÕÝÐ_ßÐÚÕâÐ...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "ÁÐÜÞ áãßÕàÚÞàØáÝØÚ ÜÞÖÕ ØÝáâÐÛØàÐâØ ÛÞÚÐÛÝÕ ßÐÚÕâe"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "½ÕÜÐ ßÐÚÕâÐ áÐ ØÜÕÝÞÜ %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "¿ÞâàÕÑÝØ áã áÛÕÔÕûØ ßÐÚÕâ(Ø):"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "ÁÛÕÔÕûØ ßÐÚÕâØ áÐÔàÖÕ %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "èâÐ øÕ ÒÐè Ø×ÑÞà ? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "¿àÕâàÐÖØÒÐúÕ rpm ÑÐ×Õ ÝÕãáßÕÛÞ\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "»Þè Ø×ÑÞà,ßàÞÑÐøâÕ ßÞÝÞÒÞ\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "ÀÐÔØ ×ÐÔÞÒÞùÕúÐ ×ÐÒØáÝÞáâØ, áÛÕÔÕûØ ßÐÚÕâØ ûÕ áÕ ØÝáâÐÛØàÐâØ (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "´Ð ÛØ øÕ ¾K ?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "¾K"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "¿ÞÝØèâØ"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "ÃÑÐæØâÕ %s áÐ ØÜÕÝÞÜ %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "¿àØâØáÝØâÕ enter ÚÐÔÐ ×ÐÒàèØâÕ"
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "½Õ ÜÞÓã ÝÐûØ %s äÐøÛ,Ø×ÛÐ×ØÜ"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "áÒÕ øÕ ÒÕû ØÝáâÐÛØàÐÝÞ"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "¸ÝáâÐÛØàÐÜ %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "¸ÝáâÐÛÐæØÙÐ ÝÕãáßÕÛÐ"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "¸ÝáâÐÛØÐæØøÐ ÑÕ× ßàÞÒÕàÕ ×ÐÒØáÝÞáâØ ?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "¿àØáØÛÝÐ ØÝáâÐÛÐæØøÐ ?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "¿ÞâàÕÑÝØ áã áÛÕÔÕûØ ßÐÚÕâ(Ø):"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "èâÐ øÕ ÒÐè Ø×ÑÞà ? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "»Þè Ø×ÑÞà,ßàÞÑÐøâÕ ßÞÝÞÒÞ\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "½ÕãáßÕÛe ×ÐÒØáÝÞáâØ: %s ×ÐåâÕÒa %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "¿ÞáâãßÐÚ: urpmi [-h] [--auto] [--force] [-a] ØÜÕ_ßÐÚÕâÐ [ØÜÕÝÐ_ßÐÚÕâÐ...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "½ÕÜÐ ßÐÚÕâÐ áÐ ØÜÕÝÞÜ %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "ÁÛÕÔÕûØ ßÐÚÕâØ áÐÔàÖÕ %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "¿àÕâàÐÖØÒÐúÕ rpm ÑÐ×Õ ÝÕãáßÕÛÞ\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "½Õ ÜÞÓã ÝÐûØ %s äÐøÛ,Ø×ÛÐ×ØÜ"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "½ÕãáßÕÛe ×ÐÒØáÝÞáâØ: %s ×ÐåâÕÒa %s"
diff --git a/po/sr.po b/po/sr.po
index 4873985a..bb7a9c61 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-04-20 19:20+0100\n"
 "Last-Translator: Tomislav Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian(latin) <come.to@Linux-YU>\n"
@@ -15,98 +15,207 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "Instaliram %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Da li je OK ?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "OK"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Poni¹ti"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"Postupak: urpmi [-h] [--auto] [--force] [-a] ime_paketa [imena_paketa...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Samo superkorisnik mo¾e instalirati lokalne pakete"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "Nema paketa sa imenom %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Potrebni su sledeæi paket(i):"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Sledeæi paketi sadr¾e %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "¹ta je va¹ izbor ? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "Pretra¾ivanje rpm baze neuspelo\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Lo¹ izbor,probajte ponovo\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "Radi zadovoljenja zavisnosti, sledeæi paketi æe se instalirati (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Da li je OK ?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "OK"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Poni¹ti"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ubacite %s sa imenom %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Pritisnite enter kada zavr¹ite"
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Ne mogu naæi %s fajl,izlazim"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "sve je veæ instalirano"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "Instaliram %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "InstalaciÙa neuspela"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Instaliacija bez provere zavisnosti ?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Prisilna instalacija ?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Potrebni su sledeæi paket(i):"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¹ta je va¹ izbor ? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Lo¹ izbor,probajte ponovo\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Neuspele zavisnosti: %s zahteva %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "Postupak: urpmi [-h] [--auto] [--force] [-a] ime_paketa [imena_paketa...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "Nema paketa sa imenom %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Sledeæi paketi sadr¾e %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "Pretra¾ivanje rpm baze neuspelo\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Ne mogu naæi %s fajl,izlazim"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Neuspele zavisnosti: %s zahteva %s"
diff --git a/po/sv.po b/po/sv.po
index 676fe9d9..9230c7f1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-10-31 20:45+01:00\n"
 "Last-Translator: Henrik Borg <datb@thegym.net>\n"
 "Language-Team: Swedish\n"
@@ -16,30 +16,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "installerar %s\n"
+
+#: _irpm:31
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Är det ok?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Ok"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr ""
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
-msgstr "använd: urpmi [-h] [--auto] [--force] [-a] paketnamn [paketnamn...]\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
 
-#: ../urpmi:56
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Endast superanvädare får installera lokala paket"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "inget paket med namn %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Ett av följande paket är nödvändigt"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Följande paket innehåller %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Vad är ditt val? ( 1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm databasfråga misslyckades\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Tyvärr, dåligt val, försök igen\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -49,67 +129,97 @@ msgstr ""
 "\n"
 "(%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Är det ok?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Var god sätt in %s med namnet %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Tryck enter när du är klar..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Tyvärr kan inte finna fil %s, avbryter"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "allting redan installerat"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "installerar %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Installering misslyckad"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Prova att installera utan att kolla behov av andra filer"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Prova en ännu starkare installation (t ex --force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Ett av följande paket är nödvändigt"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Vad är ditt val? ( 1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Tyvärr, dåligt val, försök igen\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Behov av fler filer: paket/fil %s behöver %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "använd: urpmi [-h] [--auto] [--force] [-a] paketnamn [paketnamn...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "inget paket med namn %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Följande paket innehåller %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm databasfråga misslyckades\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Tyvärr kan inte finna fil %s, avbryter"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Behov av fler filer: paket/fil %s behöver %s"
diff --git a/po/th.po b/po/th.po
index fb5d2244..3b53395a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-08-28 05:00+0700\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai\n"
@@ -13,32 +13,110 @@ msgstr ""
 "Content-Type: text/plain; charset=tis-620\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "¡ÓÅѧµÔ´µÑé§ %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "µ¡Å§ãËÁ¤ÃѺ"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "µ¡Å§"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "¡àÅÔ¡"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"¡ÒÃãªé§Ò¹: urpmi [-h] [--auto] [--force] [-a] package_name "
-"[package_name...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "superuser à·èÒ¹Ñé¹·ÕèÁÕÊÔ·¸ÔµÔ´µÑé§ packages"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "äÁèÁÕª×èÍ package %s \n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "˹Öè§ã¹ Packages µèÍ仹Õéµéͧä´éÃѺ¡ÒõԴµÑé§ "
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "packages µèÍ仹ÕéÁÕ %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "µéͧ¡ÒÃàÅ×Í¡ÍÐääÃѺ  (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "¡Òäé¹ËÒ°Ò¹¢éÍÁÙÅ rpm äÁèÊÓàÃç¨\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "¡ÒÃàÅ×Í¡äÁè¶Ù¡µéͧ ÅͧãËÁè¤ÃѺ\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -46,67 +124,98 @@ msgid ""
 msgstr ""
 "à¾×èÍ·Õè¨Ðá¡é㢻ѭËÒ¡ÒÃà¢éҡѹä´é packages µèÍ仹Õé¨Ð¶Ù¡µÔ´µÑé§ (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "µ¡Å§ãËÁ¤ÃѺ"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "µ¡Å§"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "¡àÅÔ¡"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "¡ÃسÒãÊè %s ·ÕèÁÕª×èÍ %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "¡Ãسҡ´ enter àÁ×èÍàÊÃç¨ÊÔé¹"
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "äÁèÊÒÁÒöËÒä¿Åì %s à¨Í¤ÃѺ... ¡ÓÅѧàÅÔ¡·Ó§Ò¹"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "·Ø¡ÍÂèÒ§ä´é¶Ù¡µÔ´µÑé§àÃÕºÃéÍÂáÅéÇ"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "¡ÓÅѧµÔ´µÑé§ %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "¡ÒõԴµÑé§äÁèÊÓàÃç¨"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "µéͧ¡Ò÷´ÅͧµÔ´µÑé§â´Â·ÕèäÁèµéͧµÃͨÊͺ¤ÇÒÁà¢éҡѹä´é?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "µéͧ¡Ò÷´ÅͧºÑ§¤ÑºµÔ´µÑé§?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "˹Öè§ã¹ Packages µèÍ仹Õéµéͧä´éÃѺ¡ÒõԴµÑé§ "
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "µéͧ¡ÒÃàÅ×Í¡ÍÐääÃѺ  (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "¡ÒÃàÅ×Í¡äÁè¶Ù¡µéͧ ÅͧãËÁè¤ÃѺ\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "ÁջѭËÒ¡ÒÃà¢éҡѹä´é¢Í§â»Ãá¡ÃÁ:  %s µéͧ¡Òà %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "¡ÒÃãªé§Ò¹: urpmi [-h] [--auto] [--force] [-a] package_name "
+#~ "[package_name...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "äÁèÁÕª×èÍ package %s \n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "packages µèÍ仹ÕéÁÕ %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "¡Òäé¹ËÒ°Ò¹¢éÍÁÙÅ rpm äÁèÊÓàÃç¨\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "äÁèÊÒÁÒöËÒä¿Åì %s à¨Í¤ÃѺ... ¡ÓÅѧàÅÔ¡·Ó§Ò¹"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "ÁջѭËÒ¡ÒÃà¢éҡѹä´é¢Í§â»Ãá¡ÃÁ:  %s µéͧ¡Òà %s"
diff --git a/po/tr.po b/po/tr.po
index ab0dbd69..044a4022 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-01-01 01:00+0200\n"
 "Last-Translator: Görkem Çetin <gorkem@gelecek.com.tr>\n"
 "Language-Team: Turksih <tr@li.org>\n"
@@ -13,31 +13,110 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "%s kuruluyor\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Tamam mý?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "Tamam"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Ýptal"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"kullaným: urpmi [-h] [--auto] [--force] [-a] paket_adý [paket_adlarý...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Yerel paketleri kurmak için sadece sistem yöneticisi yetkilidir"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "%s adýnda bir paket yok\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "Aþaðýdaki paketlerin bir tanesine ihtiyaç var:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Bu paketler %s içeriyor: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Seçiminiz? (1-%d)"
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm veritabaný eriþimi yapýlamadý\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Hatalý seçenek, tekrar deneyin\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -46,67 +125,97 @@ msgstr ""
 "Baðýmlýlýk sorununu aþabilmek için, aþaðýdaki paketlerin de kurulmasý "
 "gerekiyor (%d Mb)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Tamam mý?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "Tamam"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Ýptal"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "%s'i yerine yerleþtirin (%s)"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Bittiði zaman enter tuþuna basýn..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "%s dosyasý bulunamadý, çýkýlýyor"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "herþey zaten kurulu durumda"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "%s kuruluyor\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "Kurulum baþarýsýz oldu"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "Paket baðýmlýlýklarýný denetlemeksizin kurulum yapmayý deneyin"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "Belki daha zorlayýcý bir seçenek gerekebilir (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "Aþaðýdaki paketlerin bir tanesine ihtiyaç var:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Seçiminiz? (1-%d)"
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Hatalý seçenek, tekrar deneyin\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Baðýmlý paketlerde eksik %s için %s gerekli"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "kullaným: urpmi [-h] [--auto] [--force] [-a] paket_adý [paket_adlarý...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "%s adýnda bir paket yok\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Bu paketler %s içeriyor: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm veritabaný eriþimi yapýlamadý\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "%s dosyasý bulunamadý, çýkýlýyor"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Baðýmlý paketlerde eksik %s için %s gerekli"
diff --git a/po/uk.po b/po/uk.po
index 9283506c..912456f4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-06-16 08:10+09:00\n"
 "Last-Translator: Dmytro Koval'ov <kov@tokyo.email.ne.jp>\n"
 "Language-Team: Ukrainian\n"
@@ -14,33 +14,111 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "×ÓÔÁÎÏ×ÌÀÀ %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "÷¦ÒÎÏ?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "ôÁË"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "÷¦ÄͦÎÉÔÉ"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
-"×ÉËÏÒÉÓÔÁÎÎÑ: urpmi [-h] [--auto] [--force] [-a] ÎÁÚ×Á_ÐÁËÅÔÕ "
-"[ÎÁÚ×É_ÐÁËÅÔ¦×...]\n"
 
-#: ../urpmi:56
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr ""
 "÷ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÌÏËÁÌØΦ ÐÁËÅÔÉ ÄÏÚ×ÏÌÅÎÏ Ô¦ÌØËÉ ÓÉÓÔÅÍÎÏÍÕ ÁÄͦΦÓÔÒÁÔÏÒÕ"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "ÎÅÍÁ¤ ÐÁËÅÔÕ Ú ÎÁÚ×ÏÀ %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "ðÏÔÒ¦ÂÅÎ ÏÄÉÎ ¦Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÅÔ¦×:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr " 㦠ÐÁËÅÔÉ Í¦ÓÔÑÔØ × ÓϦ %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "÷ÁÛ ×ɦÒ? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "×ÉÂÏÒËÁ ÄÁÎÉÈ Ú ÂÁÚÉ ÄÁÎÉÈ rpm ÎÅÕÓЦÛÎÁ\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "îÅצÒÎÉÊ ×ɦÒ, ÓÐÒÏÂÕÊÔÅ ÝÅ ÒÁÚ\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -49,67 +127,98 @@ msgstr ""
 "îÁÓÔÕÐΦ ÐÁËÅÔÉ ÂÕÄÕÔØ ×ÓÔÁÎÏ×ÌÅΦ ÄÌÑ ÔÏÇÏ, ÝÏ ÚÁÄÏ×ÏÌØÎÉÔÉ ÚÁÌÅÖÎÏÓÔ¦  "
 "(%d íâ)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "÷¦ÒÎÏ?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "ôÁË"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "÷¦ÄͦÎÉÔÉ"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "÷ÓÔÁ×ÔÅ ÂÕÄØ-ÌÁÓËÁ %s Ð¦Ä ÎÁÚ×ÏÀ %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "îÁÔÉÓΦÔØ Enter ЦÓÌÑ ÚÁ˦ÎÞÅÎÎÑ..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÆÁÊÌ %s, ÚÁ˦ÎÞÕÀ ÒÏÂÏÔÕ"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "×ÓÅ ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "×ÓÔÁÎÏ×ÌÀÀ %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "õÓÔÁÎÏ×ËÁ ÎÅÕÓЦÛÎÁ"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "óÐÒÏÂÕ×ÁÔÉ ÕÓÔÁÎÏ×ËÕ ÂÅÚ ÐÅÒÅצÒËÉ ÚÁÌÅÖÎÏÓÔÅÊ?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "óÐÒÏÂÕ×ÁÔÉ ÐÒÉÍÕÓÏ×Õ ÕÓÔÁÎÏ×ËÕ (--force)?"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "ðÏÔÒ¦ÂÅÎ ÏÄÉÎ ¦Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÅÔ¦×:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "÷ÁÛ ×ɦÒ? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "îÅצÒÎÉÊ ×ɦÒ, ÓÐÒÏÂÕÊÔÅ ÝÅ ÒÁÚ\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "ðÏÍÉÌËÁ ÚÁÌÅÖÎÏÓÔÅÊ: ÄÌÑ %s ÐÏÔÒ¦ÂÅÎ %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "×ÉËÏÒÉÓÔÁÎÎÑ: urpmi [-h] [--auto] [--force] [-a] ÎÁÚ×Á_ÐÁËÅÔÕ "
+#~ "[ÎÁÚ×É_ÐÁËÅÔ¦×...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "ÎÅÍÁ¤ ÐÁËÅÔÕ Ú ÎÁÚ×ÏÀ %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr " 㦠ÐÁËÅÔÉ Í¦ÓÔÑÔØ × ÓϦ %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "×ÉÂÏÒËÁ ÄÁÎÉÈ Ú ÂÁÚÉ ÄÁÎÉÈ rpm ÎÅÕÓЦÛÎÁ\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÆÁÊÌ %s, ÚÁ˦ÎÞÕÀ ÒÏÂÏÔÕ"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "ðÏÍÉÌËÁ ÚÁÌÅÖÎÏÓÔÅÊ: ÄÌÑ %s ÐÏÔÒ¦ÂÅÎ %s"
diff --git a/po/urpmi.pot b/po/urpmi.pot
index eb609aab..6e23942f 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,97 +14,184 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../urpmi:38
+#: _irpm:21
+msgid "installing $rpm\n"
+msgstr ""
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
 msgstr ""
 
-#: ../urpmi:56
-msgid "Only superuser is allowed to install local packages"
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
 msgstr ""
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
 msgstr ""
 
-#: ../urpmi:89
-#, c-format
-msgid "The following packages contain %s: %s\n"
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr ""
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
 msgstr ""
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
+#: _irpm:61
+msgid "$rpm: command not found\n"
 msgstr ""
 
-#: ../urpmi:107
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr ""
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed "
-"(%d MB)"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
 msgstr ""
 
-#: ../urpmi:108
-msgid "Is it ok?"
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
 msgstr ""
 
-#: ../urpmi:111
-msgid "Ok"
+#: urpmi:118
+msgid "Only superuser is allowed to install local packages"
 msgstr ""
 
-#: ../urpmi:112
-msgid "Cancel"
+#: urpmi:160
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../urpmi:159
+#: urpmi:168
 #, c-format
-msgid "Please insert the %s named %s"
+msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi:161
-msgid "Press enter when it's done..."
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr ""
+
+#: urpmi:194
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed "
+"(%d MB)"
 msgstr ""
 
-#: ../urpmi:166
+#: urpmi:220
 #, c-format
-msgid "Sorry can't find file %s, exiting"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
+
+#: urpmi:221
+msgid "Press enter when it's done..."
 msgstr ""
 
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr ""
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr ""
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr ""
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr ""
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr ""
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
 msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
 msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
+
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index d4c1d97c..a5fca37c 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -14,99 +14,237 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+msgid "installing $rpm\n"
+msgstr "dj' astale $rpm\n"
+
+#: _irpm:31
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "Totafwait est-i comufåt?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "I va"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "Rinoncî"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr "Nn"
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr "OoAaYyWw"
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr " (O/n) "
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr "$rpm: comande nén trovéye\n"
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr "po s' è siervî: rpmf [<fitchî>]"
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr "urpmi n' est nén astalé"
+
+#: placeholder.h:8
+#, c-format
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
 msgstr ""
-"Po s' è siervî: urpmi [-h] [--auto] [--force] [-a] no_pacaedje "
-"[nos_pacaedjes...]\n"
+"urpmi modeye %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"Çouci est on libe programe èt pout esse cossemé so les termes del licince "
+"GPL.\n"
+"po s' è siervî:\n"
+"  --help           - mostere ci messaedje d' aidance.\n"
+"===>A RATOÛRNER <===\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+"po s' è siervî: urpmi.addmedia <etikete> <hårdeye>\n"
+"li <hårdeye> pout esse ene etur:\n"
+"\tfile://<tchimin>\n"
+"\tftp://<login>:<sicret>@<lodjeu>/<tchimin> with <tchimin relatif pol fitchî "
+"hdlist>\n"
+"\tftp://<lodjeu>/<tchimin> with <tchimin relatif pol fitchî hdlist>\n"
+"\thttp://<lodjeu>/<tchimin> with <tchimin relatif pol fitchî hdlist>\n"
+"        removable_<éndjin>_<limerô>://<tchimin>\n"
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr "urpmi modeye %s"
 
-#: ../urpmi:56
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Seulmint li super-ûzeu a l' droet d' astaler des pacaedjes locås"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "nou pacaedje lomé %s\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "I gn a mezåjhe d' onk des pacaedjes ki shûvèt:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "Les pacaedjes ki shûvèt ont å dvins %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Ké tchwezixhoz-ve? (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "Yåk n' a nén stî tot cwerant èl båze di doneyes rpm\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "Måva tchûze, sayîz co ene feye\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
-msgstr "Les pacaedjes aloyîs ki shûvèt vont esse astalés (%d Mo)"
-
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "Totafwait est-i comufåt?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "I va"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "Rinoncî"
+msgstr ""
+"Po satisfyî les aloyaedjes, les pacaedjes aloyîs ki shûvèt vont esse astalés "
+"(%d Mo)"
 
-#: ../urpmi:159
+#: urpmi:220
 #, c-format
-msgid "Please insert the %s named %s"
-msgstr "S' i s' plait metoz li %s lomé %s"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "S' i vs plait metoz li sopoirt lomé «%s» èl éndjin [%s]"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "Tapez so «enter» cwand c' est fwait..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "Dji rgrete, dji n' pout trover l' fitchî %s, dji cwite"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "tot a ddja stî astalé"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "dj' astale %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "L' astalåcion a fwait berwete"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
-msgstr "Sayî d' astaler sin verifyî les aloyaedjes?"
+#: urpmi:254
+msgid "Try installation without checking dependencies? (Y/n) "
+msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (O/n) "
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
-msgstr "Sayî d' astaler co pus foirt (--force)?"
+#: urpmi:260
+msgid "Try installation even more strongly (--force)? (Y/n) "
+msgstr "Sayî d' astaler co pus foirt (--force)? (O/n) "
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "I gn a mezåjhe d' onk des pacaedjes ki shûvèt:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr "Po s' è siervî: urpmi.addmedia <etikete> <hårdeye>"
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ké tchwezixhoz-ve? (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr "$usage  måva limerô (c' est «$num»)\n"
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "Måva tchûze, sayîz co ene feye\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr "$usage  l' éndjin «$dev» n' egzistéye nén\n"
+
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr "$usage  i manke li tchmin relatif pol fitchî hdlist\n"
 
-#: ../urpmi:251
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr "$usage  «with» manke pol sopoirt ftp\n"
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Aloyaedjes nén verifyî: %s a mezåjhe di %s"
+msgid "urpmq version %s"
+msgstr "urpmq modeye %s"
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+"urpmq: tchjûze «-$1» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr "urpmq: dji n' sai lere li fitchî rpm «$_»\n"
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+"des pacaedjes k' i gn a ont mezåjhe d' esse bodjî foû po poleur esse metous "
+"a djoû, çoula n' est nén co sopoirté\n"
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr "dji n' a savou prinde les pacaedjes soûrdants, dji lai toumer"
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr ""
+#~ "Po s' è siervî: urpmi [-h] [--auto] [--force] [-a] no_pacaedje "
+#~ "[nos_pacaedjes...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "nou pacaedje lomé %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "Les pacaedjes ki shûvèt ont å dvins %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "Yåk n' a nén stî tot cwerant èl båze di doneyes rpm\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "Dji rgrete, dji n' pout trover l' fitchî %s, dji cwite"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Aloyaedjes nén verifyî: %s a mezåjhe di %s"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 52990708..1fc11261 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-09-21 17:04+0800\n"
 "Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
 "Language-Team: Chinese (GB) <zh@li.org>\n"
@@ -13,97 +13,206 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "ÕýÔÚ°²×° %s\n"
+
+#: _irpm:31
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "ÕâÑùºÃÁËÂð?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "È·ÈÏ"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "È¡Ïû"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr ""
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
-msgstr "Ó÷¨: urpmi [-h] [--auto] [--force] [-a] Èí¼þ°üÃû [Èí¼þ°üÃû...]\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
 
-#: ../urpmi:56
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "Ö»Óг¬¼¶Óû§¿ÉÒÔ°²×°±¾»úÈí¼þ°ü"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "ûÓÐÃûΪ %s µÄÈí¼þ°ü\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "ÐèÒªÏÂÁÐÈí¼þ°üÖ®Ò»:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "ÏÂÁÐÈí¼þ°üÀïÓÐ %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "ÇëÊäÈëÄúµÄÑ¡Ôñ:  (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm Êý¾Ý¿â²éѯʧ°Ü\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "¶Ô²»Æð, Ñ¡ÔñÎÞЧ, ÇëÔÙÊÔÒ»´Î\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "ÎÒ½«ÁíÍâ°²×°ÏÂÁÐÈí¼þ°ü (%d MB), ÒÔÂú×ãÏà¹ØÐÔÒªÇó"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "ÕâÑùºÃÁËÂð?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "È·ÈÏ"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "È¡Ïû"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Çë²åÈë %s, ±êÇ©ÊÇ %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "×¼±¸ºÃºó°´ Enter ¼ü..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "¶Ô²»Æð, ûÓÐÕÒµ½Îļþ %s, ÕýÔÚÍ˳ö"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "È«²¿°²×°Íê³É"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "ÕýÔÚ°²×° %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "°²×°Ê§°Ü"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "³¢ÊÔºöÂÔÏà¹ØÐÔ¼ì²é¶ø°²×°Âð?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "³¢ÊÔ¸ü¼¤Áҵݲװ·½Ê½Âð? (ʹÓà --force)"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "ÐèÒªÏÂÁÐÈí¼þ°üÖ®Ò»:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "ÇëÊäÈëÄúµÄÑ¡Ôñ:  (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "¶Ô²»Æð, Ñ¡ÔñÎÞЧ, ÇëÔÙÊÔÒ»´Î\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "Ïà¹ØÐÔ´íÎó: %s ÐèÒª %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr "Ó÷¨: urpmi [-h] [--auto] [--force] [-a] Èí¼þ°üÃû [Èí¼þ°üÃû...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "ûÓÐÃûΪ %s µÄÈí¼þ°ü\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "ÏÂÁÐÈí¼þ°üÀïÓÐ %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm Êý¾Ý¿â²éѯʧ°Ü\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "¶Ô²»Æð, ûÓÐÕÒµ½Îļþ %s, ÕýÔÚÍ˳ö"
+
+#~ msgid "Failed dependencies: %s requires %s"
+#~ msgstr "Ïà¹ØÐÔ´íÎó: %s ÐèÒª %s"
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index b15ab4bb..e790d01a 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -7,8 +7,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 1999-12-11 04:18+0100\n"
 "Last-Translator: Andrew Lee <andrew@cle.linux.org.tw>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -16,97 +16,201 @@ msgstr ""
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "¦w¸Ë¤¤ %s\n"
+
+#: _irpm:31
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
-msgstr "¥Îªk: urpmi [-h] [--auto] [--force] [-a] ®M¥ó¦WºÙ [®M¥ó¦WºÙ...]\n"
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
 
-#: ../urpmi:56
-msgid "Only superuser is allowed to install local packages"
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "¥¿½T¶Ü¡S"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "½T©w"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "¨ú®ø"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
 msgstr ""
 
-#: ../urpmi:87
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
 #, c-format
-msgid "no package named %s\n"
-msgstr "¨S¦³®M¥ó¦WºÙ %s\n"
+msgid "urpmi version %s"
+msgstr ""
 
-#: ../urpmi:89
+#: urpmi:118
+msgid "Only superuser is allowed to install local packages"
+msgstr ""
+
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "³o¤@­Ó®M¥ó»Ý­n"
+
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "³o®M¥ó¥]§t¤F %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "¨º¤@­Ó¬O§Aªº¿ï¾Ü¡S (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm¸ê®Æ®w¬d´M¥¢±Ñ\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "¹ï¤£°_¡A¿ï¾Ü¿ù»~¡A½Ð¦A¸Õ¤@¦¸\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "¬°¤F²Å¦X¬Û¨Ì©Êªº­n¨D¡A¥H¤Uªº®M¥ó±N­n³Q¦w¸Ë¡C (%d MB)"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "¥¿½T¶Ü¡S"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "½T©w"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "¨ú®ø"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "½Ð´¡¤J %s ¦WºÙ %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "§¹¦¨«á½Ð«ö<Enter>¡D¡D"
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "µLªk§ä¨ìÀÉ®× %s, ¤¤Â_"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "©Ò¦³³£¤w¦w¸Ë"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "¦w¸Ë¤¤ %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "¦w¸Ë¥¢±Ñ"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr ""
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr ""
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "³o¤@­Ó®M¥ó»Ý­n"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¨º¤@­Ó¬O§Aªº¿ï¾Ü¡S (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "¹ï¤£°_¡A¿ï¾Ü¿ù»~¡A½Ð¦A¸Õ¤@¦¸\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
+
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
 msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr "¥Îªk: urpmi [-h] [--auto] [--force] [-a] ®M¥ó¦WºÙ [®M¥ó¦WºÙ...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "¨S¦³®M¥ó¦WºÙ %s\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "³o®M¥ó¥]§t¤F %s: %s\n"
+
+#~ msgid "rpm database query failed\n"
+#~ msgstr "rpm¸ê®Æ®w¬d´M¥¢±Ñ\n"
+
+#~ msgid "Sorry can't find file %s, exiting"
+#~ msgstr "µLªk§ä¨ìÀÉ®× %s, ¤¤Â_"