29 files changed, 883 insertions, 490 deletions
diff --git a/ChangeLog b/ChangeLog
index 61365cc1..99c2a79a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-03-26  Pixel  <pixel@mandrakesoft.com>
+
+        - urpmi can handle package files given on command line. It finds
+	out the dependencies if possible.
+	- don't try nodeps if file is missing
+	- new group
+	- adapted urpmi.addmedia to new hdlist's / multi-cd
+	- adapted autoirpm.update-all to new rpmlib
+
 2000-02-28  Pixel  <pixel@mandrakesoft.com>
 
 	* autoirpm.update-all.cc: s/FILENAMES/OLDFILENAMES/
diff --git a/Makefile b/Makefile
index 01c0dbde..bb4e5a91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
- PREFIX = 
+PREFIX = 
 BINDIR = $(PREFIX)/usr/bin
 MANDIR = $(PREFIX)/usr/man
 SBINDIR = $(PREFIX)/usr/sbin
@@ -6,6 +6,8 @@ XBINDIR = $(PREFIX)/usr/X11R6/bin
 URPMIDIR = $(PREFIX)/var/lib/urpmi
 URPMIDIR2 = $(PREFIX)/etc/urpmi
 LOCALEDIR = $(PREFIX)/usr/share/locale
+CFLAGS = -Wall -g
+LIBRPM = -lrpm -ldb1 -lz -lbz2 -I/usr/include/rpm -lpopt
 
 NAME = urpmi
 TAR = $(NAME).tar.bz2
@@ -19,14 +21,14 @@ install: autoirpm.update-all
 	install _irpm rpm-find-leaves rpmf $(BINDIR)
 	install -m 644 autoirpm.deny $(URPMIDIR2)
 	install -m 644 *.8 $(MANDIR)/man8
-	install urpmi.addmedia autoirpm.update autoirpm.uninstall $(SBINDIR)
+	install rpme urpmi.addmedia autoirpm.update autoirpm.uninstall $(SBINDIR)
 	install -s autoirpm.update-all $(SBINDIR)
 	ln -sf urpmi.addmedia $(SBINDIR)/urpmi.removemedia
 	ln -sf urpmi.addmedia $(SBINDIR)/urpmi.update
 	install gurpmi $(XBINDIR)
 
-autoirpm.update-all: %: %.cc
-	$(CXX) -I/usr/include/rpm -g $< -lrpm -ldb1 -lz -o $@
+autoirpm.update-all: %: %.cc 
+	$(CXX) $(CFLAGS) $< $(LIBRPM) -o $@
 
 tar: clean
 	cd .. ; tar cfy $(TAR) urpmi
diff --git a/autoirpm.update-all.cc b/autoirpm.update-all.cc
index 90b524e0..de96edd4 100644
--- a/autoirpm.update-all.cc
+++ b/autoirpm.update-all.cc
@@ -44,26 +44,42 @@ int main(int argc, char **argv) {
     while ((header=headerRead(fd, HEADER_MAGIC_YES))) {
       int_32 type, count;
       unsigned short *p;
-      char **f, *name, *s;
+      char **f, *name;
       int printed = 0;
 
-      headerGetEntry(header, RPMTAG_NAME, &type, (void **) &name, &count);
+      headerGetEntry(header, RPMTAG_NAME, &type, (void **) &name, NULL);
       headerGetEntry(header, RPMTAG_FILEMODES, &type, (void **) &p, &count);
-      headerGetEntry(header, RPMTAG_OLDFILENAMES, &type, (void **) &f, &count);
-      for (; count--; *p++, *f++)
-	if ((*p & 040111) == 0111 && 
-	    (s = strrchr(*f, '/')) && 
-	    s - 3 >= *f && 
-	    strncmp(s - 3, "bin", 3) == 0 &&
-	    (!allow || allow->count(s + 1)) &&
-	    (!deny || !deny->count(s + 1))) {
+      headerGetEntry(header, RPMTAG_OLDFILENAMES, &type, (void **) &f, NULL);
 
-	  if (!printed) {
-	    printed = 1;
-	    cout << name;
+      char ** baseNames, ** dirNames;
+      int_32 * dirIndexes;
+      headerGetEntry(header, RPMTAG_BASENAMES, &type, (void **) &baseNames, NULL);
+      headerGetEntry(header, RPMTAG_DIRINDEXES, &type, (void **) &dirIndexes, NULL);
+      headerGetEntry(header, RPMTAG_DIRNAMES, &type, (void **) &dirNames, NULL);
+
+      for (int i = 0; i < count; i++) {
+	if ((p[i] & 040111) == 0111) {
+	  int ok;
+	  if (f) {
+	    char *s = strrchr(f[i], '/');
+	    ok = s && s - 3 >= f[i] && strncmp(s - 3, "bin", 3) == 0 &&
+	      (!allow || allow->count(s + 1)) &&
+	      (!deny || !deny->count(s + 1));
+	  } else {
+	    char *d = dirNames[dirIndexes[i]];
+	    ok = strlen(d) >= 4 && strncmp(d + strlen(d) - 4, "bin/", 4) == 0 &&
+	      (!allow || allow->count(baseNames[i])) &&
+	      (!deny || !deny->count(baseNames[i]));
+	  }
+	  if (ok) {
+	    if (!printed) {
+	      printed = 1;
+	      cout << name;
+	    }
+	    if (f) cout << " " << f[i]; else cout << " " << dirNames[dirIndexes[i]] << baseNames[i];
 	  }
-	  cout << " " << *f;
 	}
+      }
       if (printed) cout << "\n";
     }
     fdClose(fd);
diff --git a/po/bg.po b/po/bg.po
index 34f26585..d2d40b5e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 2000-01-30 17:59+0100\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team:  Bulgarian\n"
@@ -13,79 +13,88 @@ msgstr ""
 "Content-Type: text/plain; charset=windows-1251\n"
 "Content-Transfer-Encoding: 8bits\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "����������: urpmi [--auto] ���_��_����� [�����_��_������...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "���� ����� ������� %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "���� ������ �������� %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "��������,rpm ���� �����,���������\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "�� �� �� ������� �������������,���� ������ �� ����� ����������� "
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "���� ����� �� �"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "�����"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "�����"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "���� ������� %s ������� %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "��������� enter,������ ��� ������"
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "���������,������ �� ������ ���� %s, �������"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "������ � ����������� ����"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "����������� %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "������������ ���������"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "���� �� ���� ������ � ���������:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "����� � ������ �����? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "���������,��� �����, �������� ������\n"
diff --git a/po/ca.po b/po/ca.po
index d81c7171..e6a22ed9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 2000-02-01 00:00+0100\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -13,25 +13,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "sintaxi: urpmi [--auto] nom_paquet [noms_paquets...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "no hi cap paquet anomenat %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Els paquets seg�ents contenen %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "La consulta de la base de dades de l'rpm ha fallat\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -39,55 +40,63 @@ msgid ""
 msgstr ""
 "Per complir les depend�ncies, s'instal�laran els paquets seg�ents (%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "�s correcte?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Cancel�la"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Si us plau, inseriu el %s anomenat %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Premeu Intro quan estigui fet..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "No es pot trobar el fitxer %s, s'est� sortint"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "ja est� tot instal�lat"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "s'est� instal�lant %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "La instal�laci� ha fallat"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Cal un dels paquets seg�ents:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Quina �s la vostra elecci�? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Elecci� incorrecta, torneu-ho a provar\n"
 
diff --git a/po/da.po b/po/da.po
index 825413ab..f335e1ca 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 2000-03-17 00:22+0100\n"
 "Last-Translator: Troels Liebe Bentsen <tlb@iname.com>\n"
 "Language-Team: Linux Mandrake Danish Team\n"
@@ -13,25 +13,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "bruges: urpmi [--auto] pakke_navn [pakke_navne...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "ingen pakke navngivet %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Den f�lgende pakke indeholder %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "rpm database foresp�rgsel fejlede\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -40,54 +41,62 @@ msgstr ""
 "Til at tilfredsstille afh�ngigheder, vil de f�lgende pakker blive "
 "installeret (%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "Er det ok?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Ok"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "annuller"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "V�r venlig at inds�tte %s ved navnet %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Tryk p� enter n�r den er f�rdig..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Undskyld kan ikke finde fil %s, lukker"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "alting er allerede installeret"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "installere %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "Installationen fejlede"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Der er brug for en af de f�lgende pakker:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hvad er dit valg? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Undskyld, d�rligt valg, pr�v igen\n"
diff --git a/po/de.po b/po/de.po
index 663239d3..a85af18f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 2000-01-31 17:36+0100\n"
 "Last-Translator: Stefan Siegel<siegel@informatik.uni-kl.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -13,25 +13,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "Verwendung: urpmi [--auto] Paket_Name [Paket_Namen ...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "Kein Paketname angegeben %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Das folgede Paket enth�lt %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "Die Abfrage der RPM Datenbank schlug fehl\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -40,54 +41,62 @@ msgstr ""
 "Um die Abh�ngigkeiten zu erf�llen, werden die folgenden Pakete installiert "
 "(%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "Ist das in Ordnung?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Ok"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Bitte legen Sie die %s (%s) ein."
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Best�tigen Sie dies durch dr�cken der Return Taste ..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Da ich die Datei %s nicht finden kann, beende ich mich."
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "Alles bereits installiert"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "Installiere %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "Die Installation schlug fehl"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Eines der folgenden Pakete wird ben�tigt:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ihre Wahl? (1-%d)"
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
diff --git a/po/es.po b/po/es.po
index 66de3e01..405bf3c5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 1999-08-17 16:56+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
 "Language-Team: Spanish\n"
@@ -14,25 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "uso: urpmi [--auto] nombre_de_paquete [nombres_de_paquetes...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "ning�n paquete llamado %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Los paquetes siguientes contienen %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "fall� el pedido a la base de datos de rpm\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -41,54 +42,62 @@ msgstr ""
 "De manera a resolver las dependencias, se instalar�n los paquetes siguientes "
 "(%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "�Est� todo bien?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Inserte por favor el %s llamado %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Pulse �enter� cuando est� hecho..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Disculpe, no puedo encontrar el archivo %s, saliendo"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "ya est� todo instalado"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "instalando %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "Fall� la instalaci�n"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Uno de los paquetes siguientes es necesario:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "�Qu� elige? (1-%d)"
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Disculpe, elecci�n incorrecta, reint�ntelo\n"
diff --git a/po/et.po b/po/et.po
index 2ec76dad..66e1b316 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 1999-12-11 04:18+0100\n"
 "Last-Translator: Riho Kurg <riho@aso.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -13,79 +13,88 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "kasutamine: urpmi [--auto] paketi_nimi [paketi_nimed...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "paketti %s ei leitud\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "%s sisaldub j�rmistes pakettides: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "rpm andmebaasi p�ring eba�nnestus\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, 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:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "Kas sobib?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "OK"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Ketkesta"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Palun pange masinasse %s nimega %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Vajutage Enter kui see on tehtud..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Ei ole v�imalik leida faili %s, v�ljun"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "k�ik on juba paigaldatud"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "paigaldatakse %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "Paigaldamine eba�nnestus"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on v�hemalt �ks j�rgnevatest pakettidest:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Millise(d) valite? (1-%d)"
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Selline valik ei ole lubatud, proovige uuesti\n"
diff --git a/po/fr.po b/po/fr.po
index c4976a18..68fecded 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 1999-08-17 16:56+0200\n"
 "Last-Translator: Olivier Poppon <opoppon@srd.bt.co.uk>\n"
 "Language-Team: French\n"
@@ -15,25 +15,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "usage: urpmi [--auto] nom_de_paquetage [noms_de_paquetages...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "pas de paquetage nomm� %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Les paquetages suivants contiennent %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "la requ�te sur la base de donn�es rpm a �chou�e\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -42,54 +43,62 @@ msgstr ""
 "Pour satisfaire les d�pendences, les packages suivants vont �tre install�s "
 "(%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "Est-ce correct ?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "OK"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Veullez ins�rer le %s nomm� %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Ensuite appuyez sur la touche Entr�e..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "D�sol� impossible de trouver le fichier %s, j'abandonne"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "tout est d�ja install�"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "installation de %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "L'installation a �chou�e"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Un des paquetages suivants est n�cessaire :"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Lequel choisissez-vous ? (1-%d)"
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "D�sol�, mauvais choix, veuillez r�essayez\n"
diff --git a/po/hu.po b/po/hu.po
index 0b262ba1..5288b14d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 2000-02-11 9:58+0100\n"
 "Last-Translator: Csaba Szigetv�ri <csaba.szigetvari@informedia.hu>\n"
 "Language-Team: Informedia.hu\n"
@@ -14,25 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "haszn�lat: urpmi [--auto] csomagn�v [csomagnevek...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "nincsen %s nev� csomag\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Az k�vetkez� csomagok tartalmazz�k %s-t: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "az rpm adatb�zis p�szt�z�sa nem siker�lt\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -40,54 +41,62 @@ msgid ""
 msgstr ""
 "A f�gg�s�gek kiel�g�t�s�re a k�vetkez� csomagok lettek telep�tve (%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "�gy rendben van?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Rendben"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "�keld be a/az %s-t melynek neve %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Nyomd le az enter gombot ha k�sz van..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Nem tal�lhat� az %s f�jl, ez�rt kil�pek"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "m�r minden telep�tve van"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "telep�tem: %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "A telep�t�s sikertelen volt"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "A k�vetkez� csomagok k�z�l valamelyik sz�ks�ges"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Mire esett a v�laszt�sod? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Sajn�lom, rossz v�laszt�s, pr�b�ld �jra\n"
diff --git a/po/it.po b/po/it.po
index b3e15a69..1077f52d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\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,25 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "uso: urpmi [--auto] nome_pacchetto [nome_pacchetti...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "nessun pacchettto denominato %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "I seguenti pacchetti contengono %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "interrogazione database rpm fallita\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -40,54 +41,62 @@ msgid ""
 msgstr ""
 "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti(%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "E' corretto?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Ok"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Cancella"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Per favore inserisci il %s denominato %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Premi enter appena terminato..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Spiacente non trovo il file %s, uscendo"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "tutto gi� installato"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "sto installando %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "Installazione fallita"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "E' richiesto uno dei seguenti pacchetti:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Qual'� la tua scelta? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Spiacente, scelta errata, prova di nuovo\n"
diff --git a/po/ja.po b/po/ja.po
index fcd77bfc..e63ce51f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\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,79 +14,88 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "������ˡ��urpmi [--auto] �ѥå�����̾ [�ѥå�����̾��]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "%s �ϼ��Υѥå���������ˤ���ޤ�: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "�ѥå������ǡ����١����θ����˼��Ԥ��ޤ���\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "��¸�ط��Τ��ᡢ���Υѥå������⥤�󥹥ȡ��뤷�ޤ� (%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "��������Ǥ��礦����"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "�Ϥ���³�Ԥ����"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "����������ߤ����"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "%2$s �Ȥ���̾���� %1$s ���������Ʋ�������"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "����ä���ϥ꥿���󥭡��򲡤��Ʋ�������"
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "%s �Ȥ����ե����뤬���Ĥ���ޤ���Ǥ��������Τޤ޽�λ���ޤ�"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "���٤ƴ��˥��󥹥ȡ��뤵��Ƥ��ޤ�"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "%s �򥤥󥹥ȡ������\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "�ɤ�����Ӥޤ�����(1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "ͭ��������ǤϤ���ޤ��󡣤⤦���٤��ꤤ���ޤ�\n"
diff --git a/po/no.po b/po/no.po
index 0cbc14a5..1ce152d9 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 1999-12-18 17:33+0100\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: Norwegian\n"
@@ -13,25 +13,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "bruk: urpmi [--auto] pakkenavn [pakkenavn...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "ingen pakker kalt %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "F�lgende pakker inneholder %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "rpm databaseforesp�rsel mislykket\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -39,54 +40,62 @@ msgid ""
 msgstr ""
 "F�lgende pakker vil bli installert for � tilfredstille avhengigheter (%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "Er det ok?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Ok"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Vennligst sett inn %s kalt %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Trykk enter n�r det er ferdig..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Beklager, kan ikke finne fil %s, avslutter"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "alt er allerede installert"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "installerer %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "Installasjon mislykket"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "En av f�lgende pakker beh�ves:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hva er ditt valg? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Beklager, d�rlig valg, pr�v igjen\n"
diff --git a/po/pl.po b/po/pl.po
index 9878239e..fbe991cb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: Thu Feb 10 2000 21:48:03+0200\n"
 "Last-Translator: Pawel Jablonski <pj@linux-madrake.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -14,25 +14,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "X-Generator: KTranslator v 0.5.0\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "u�ycie: urpmi [--auto] nazwa_pakietu [nazwy_pakiet�w...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "brak pakietu o nazwie %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Nast�puj�ce pakiety zawieraj� %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "zapytanie bazy rpm nie powiod�o si�\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -41,54 +42,62 @@ msgstr ""
 "Zostan� zainstalowane nast�puj�ce pakiety w celu spe�nienia zale�no�ci\n"
 "(%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "W porz�dku?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "OK"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Prosz� w�o�y� %s o nazwie %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Nacisnij enter, gdy to zrobisz..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Niestety nie mog� znale�� pliku %s, ko�cz� dzia�anie"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "wszystko jest ju� zainstalowane"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "instalowanie %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "Instalacja nie powiod�a si�"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Potrzebny jest jeden z nast�puj�cych pakiet�w:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Jaki jest Tw�j wyb�r? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Niestety, z�y wyb�r, spr�buj ponownie\n"
diff --git a/po/pt.po b/po/pt.po
index 0b2dfe11..e0e09cf7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 1999-08-17 16:56+0200\n"
 "Last-Translator: Fernando Moreira <fmoreira@netc.pt>\n"
 "Language-Team: Portuguese\n"
@@ -14,25 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "Utiliza��o: urpmi [--auto] nome_do_pacote [nomes_de_pacotes...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "Nenhum pacote com o nome %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Os seguintes pacotes incluem %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "Falhou a consulta � base de dados rpm\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -41,54 +42,62 @@ msgstr ""
 "Por forma a resolver as depend�ncias, instalar-se-�o os siguientes pacotes "
 "(%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "Est� bem assim?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Aceitar"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Insira por favor o %s chamado %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Prima �Enter� quando concluir..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Desculpe, n�o foi poss�vel localizar o ficheiro %s, a sair..."
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "J� est� tudo instalado"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "A instalar %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "A Instala��o Falhou"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Um dos seguintes pacotes � necess�rio:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Qual � a sua escolha? (1-%d)"
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Desculpe, op��o incorreta, tente de novo\n"
diff --git a/po/sk.po b/po/sk.po
index 7806a62f..3fd353d2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 2000-02-04 18:22+0200\n"
 "Last-Translator: Jan Matis <damned@hq.alert.sk>\n"
 "Language-Team: sk <i18n@hq.alert.sk>\n"
@@ -14,25 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "pou�itie : urpmi [--auto] n�zov_bal�ka [n�zvy_bal�kov...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "ziadny bal�k s n�zvom %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Nasleduj�ce bal�ky obsahuj� %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "po�iadavka na rpm datab�zu zlyhala\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -41,56 +42,64 @@ msgstr ""
 "Kv�li zachovaniu z�vislost�, by mali by� nain�talovan� nasleduj�ce bal�ky "
 "(%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "Je to v poriadku?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Ok"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Zru�"
 
 # **************fix me****************
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Pros�m vlo�te %s nazvan� %s"
 
 # ******************fix me***********
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Po ukon�en� stla�te enter..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Prep��te, nem�zem n�jst s�bor %s, kon��m"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "v�etko je u� nain�talovan�"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "in�talujem %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "In�tal�cia zlyhala"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Jeden z nasleduj�cich bal�kov je potrebn�:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "V� v�ber? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Prep��te, zl� vo�ba, sk�ste znova\n"
diff --git a/po/sv.po b/po/sv.po
index 36d6c836..1bcf1965 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 2000-01-26 00:55+01:00\n"
 "Last-Translator: Henrik Borg <datb@thegym.net>\n"
 "Language-Team: Swedish\n"
@@ -14,25 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "anv�nd: urpmi [--auto] paketnamn [paketnamn...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "inget paket med namn %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "F�ljande paket inneh�ller %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "rpm databasfr�ga misslyckades\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -42,54 +43,62 @@ msgstr ""
 "\n"
 "(%d MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "�r det ok?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Ok"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "Var god s�tt in %s med namnet %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Tryck enter n�r du �r klar..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Tyv�rr kan inte finna fil %s, avbryter"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "allting redan installerat"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "installerar %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "Installering misslyckad"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "Ett av f�ljande paket �r n�dv�ndigt"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Vad �r ditt val? ( 1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Tyv�rr, d�ligt val, f�rs�k igen\n"
diff --git a/po/tr.po b/po/tr.po
index e4b28b95..d69f2d33 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\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,25 +13,25 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO8859-9\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr ""
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "%s ad�nda bir paket yok\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Bu paketler %s i�eriyor: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "rpm veritaban� eri�imi yap�lamad�\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -40,54 +40,62 @@ msgstr ""
 "Ba��ml�l�k sorununu a�abilmek i�in, a�a��daki paketlerin de kurulmas� "
 "gerekiyor (%d Mb)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "Tamam m�?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "Tamam"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "�ptal"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "%s'i yerine yerle�tirin (%s)"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Bitti�i zaman enter tu�una bas�n..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "%s dosyas� bulunamad�, ��k�l�yor"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "her�ey zaten kurulu durumda"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "%s kuruluyor\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "Kurulum ba�ar�s�z oldu"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "A�a��daki paketlerin bir tanesine ihtiya� var:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Se�iminiz? (1-%d)"
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "Hatal� se�enek, tekrar deneyin\n"
diff --git a/po/uk.po b/po/uk.po
index cf806918..f7396fd9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 2000-02-07 10:40+09:00\n"
 "Last-Translator: Dmytro Koval'ov <kov@tokyo.email.ne.jp>\n"
 "Language-Team: Ukrainian\n"
@@ -14,25 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "������������: urpmi [--auto] �����_������ [�����_����Ԧ�...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "����� ������ � ������ %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr " � ������ ͦ����� � ��¦ %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "������� ����� � ���� ����� rpm ����Ц���\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
@@ -41,54 +42,62 @@ msgstr ""
 "������Φ ������ ������ ���������Φ ��� ����, ��� ������������ ��������Ԧ  "
 "(%d ��)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "�����?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "���"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "���ͦ����"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "������� ����-����� %s Ц� ������ %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "�����Φ�� Enter Ц��� ��˦������..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "�� ���� ������ ���� %s, ��˦���� ������"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "��� ��� �����������"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "���������� %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "��������� ����Ц���"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "���Ҧ��� ���� �� ��������� ����Ԧ�:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "��� ��¦�? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "��צ���� ��¦�, ��������� �� ���\n"
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 29c2dd19..f59a79f1 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\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,79 +14,87 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr ""
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr ""
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr ""
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr ""
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr ""
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr ""
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr ""
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr ""
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr ""
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr ""
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr ""
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 08836336..c59bca1f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\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,79 +14,88 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "Po s' � siervi: urpmi [--auto] no_pacaedje [nos_pacaedjes...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "nou pacaedje lom� %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "Les pacaedjes ki sh�v�t ont � dvins %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "Y�k n' a n�n st� to cweriant �l b�ze di doneyes rpm\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, 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 MB)"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "Totafait est-i comuf�t?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "I va"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "Rinonc�"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "S' i v' plait metoz li %s lom� %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "Tapez so �enter� cwand c' est fwait..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "Dji rgrete, dji n' pout trover l' fitch� %s, dji cwite"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "tot a ddja st� astal�"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "dj' astale %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "L' astal�cion a fwait berwete"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "I gn a mez�jhe d' onk des pacaedjes ki sh�v�t:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "K� tchwezixhoz-ve? (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "M�va tch�ze, say�z co ene feye\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index e94eb5ce..4db4e226 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi VERSION\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\n"
 "PO-Revision-Date: 2000-03-06 14:04+0800\n"
 "Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
 "Language-Team: Chinese (GB) <zh@li.org>\n"
@@ -12,79 +12,88 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "�÷�: urpmi [--auto] �������� [��������...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "û����Ϊ %s ��������\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "�������������� %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "rpm ���ݿ��ѯʧ��\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "�ҽ����ⰲװ���������� (%d MB), ������������Ҫ��"
 
-#: ../urpmi:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "������?"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "��"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "ȡ��"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "����� %s, ������ %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "׼���ú� Enter ��..."
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "�Բ���, û���ҵ��ļ� %s, �����˳�"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "ȫ����װ���"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "���ڰ�װ %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "��װʧ��"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "��Ҫ����������֮һ:"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "����������ѡ��:  (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "�Բ���, ������Ч, ������һ��\n"
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 380340fa..906b108b 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0.9\n"
-"POT-Creation-Date: 1999-12-29 20:23+0100\n"
+"POT-Creation-Date: 2000-03-26 16:01+0200\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,79 +16,88 @@ msgstr ""
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:25
-msgid "usage: urpmi [--auto] package_name [package_names...]\n"
+#: ../urpmi:34
+#, fuzzy
+msgid "usage: urpmi [-h] [--auto] [-a] package_name [package_names...]\n"
 msgstr "�Ϊk: urpmi [--auto] �M��W�� [�M��W��...]\n"
 
-#: ../urpmi:61
+#: ../urpmi:74
 #, c-format
 msgid "no package named %s\n"
 msgstr "�S���M��W�� %s\n"
 
-#: ../urpmi:62
+#: ../urpmi:76
 #, c-format
 msgid "The following packages contain %s: %s\n"
 msgstr "�o�M��]�t�F %s: %s\n"
 
-#: ../urpmi:69
+#: ../urpmi:84
 msgid "rpm database query failed\n"
 msgstr "rpm��Ʈw�d�M����\n"
 
-#: ../urpmi:79
+#: ../urpmi:94
 #, 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:80
+#: ../urpmi:95
 msgid "Is it ok?"
 msgstr "���T�ܡS"
 
-#: ../urpmi:83
+#: ../urpmi:98
 msgid "Ok"
 msgstr "�T�w"
 
-#: ../urpmi:84
+#: ../urpmi:99
 msgid "Cancel"
 msgstr "����"
 
-#: ../urpmi:126
+#: ../urpmi:141
 #, c-format
 msgid "Please insert the %s named %s"
 msgstr "�д��J %s �W�� %s"
 
-#: ../urpmi:128
+#: ../urpmi:143
 msgid "Press enter when it's done..."
 msgstr "������Ы�<Enter>�D�D"
 
-#: ../urpmi:133
+#: ../urpmi:148
 #, c-format
 msgid "Sorry can't find file %s, exiting"
 msgstr "�L�k����ɮ� %s, ���_"
 
-#: ../urpmi:142
+#: ../urpmi:157
 msgid "everything already installed"
 msgstr "�Ҧ����w�w��"
 
-#: ../urpmi:148
+#: ../urpmi:163
 #, c-format
 msgid "installing %s\n"
 msgstr "�w�ˤ� %s\n"
 
-#: ../urpmi:151
+#: ../urpmi:167 ../urpmi:177
 msgid "Installation failed"
 msgstr "�w�˥���"
 
-#: ../urpmi:179
+#: ../urpmi:172
+msgid "Try installation without cheking dependencies?"
+msgstr ""
+
+#: ../urpmi:178
+msgid "Try installation even more strongly (--force)?"
+msgstr ""
+
+#: ../urpmi:210
 msgid "One of the following packages is needed:"
 msgstr "�o�@�ӮM��ݭn"
 
-#: ../urpmi:188
+#: ../urpmi:219
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "���@�ӬO�A����ܡS (1-%d) "
 
-#: ../urpmi:191
+#: ../urpmi:222
 msgid "Sorry, bad choice, try again\n"
 msgstr "�藍�_�A��ܿ��~�A�ЦA�դ@��\n"
diff --git a/rpme b/rpme
new file mode 100644
index 00000000..a4a8cb99
--- /dev/null
+++ b/rpme
@@ -0,0 +1,68 @@
+#!/usr/bin/perl
+
+local $_ = join '', @ARGV;
+
+/-h/ || @ARGV == 0 and die "usage: rpme [-a] [--auto] <packages...>\n";
+
+$matches = /-a/;
+$auto = /-auto/;
+
+my $DIR = "/var/lib/urpmi";
+
+@l = grep { !/^-/ } @ARGV;
+if (!$matches) {
+    @m = map { chop; $_ } `rpm -q @l 2>&1`;
+    if ($?) {
+	$maymatch = "unknown package(s) " . join(", ", map { /package (\S+) is not installed/ ? $1 : () } @m) . "\n";
+	$auto || @l > 1 and die $maymatch;
+    }
+}
+if ($matches || $maymatch) {
+    my $match = join "|", @l;
+    @m = grep { /$match/ } map { chop; $_ } `rpm -qa`;
+
+    if ($maymatch) {
+	@m or die $maymatch;
+	print "Using $match as a substring, I found:\n@m\nRemove them all? (y/N) ";
+	<STDIN> =~ /y/i or exit 1;
+    }
+}
+
+load_provides();
+my %toremove; @toremove{$_, @{$provides{$_} || []}} = () foreach @m;
+my $changed = 1; while ($changed) { $changed = 0;
+    local *F;
+    open F, "rpm -e --test " . join(" ", keys %toremove) . " 2>&1 |";
+    foreach (<F>) {
+    	if (/package (\S+) is not installed/) {
+    	    delete $toremove{$1};
+    	} elsif (/is needed by (\S+)/ && ! exists $toremove{$1}) {
+    	    $toremove{$1} = 1;
+    	    $changed = 1;
+    	}
+    }
+}
+my @toremove = keys %toremove or die "nothing to remove\n";
+if (@toremove > @l && !$auto) {
+    my $sum = 0; map { $sum += $_ } `rpm -q --queryformat "%{SIZE}\n" @toremove`;
+    print "To satisfy dependencies, the following packages are going to be removed";
+    printf " (%d MB)", toMb($sum);
+    print ":\n@toremove\nIs it ok? (Y/n) ";
+    <STDIN> =~ /n/i and exit 0;
+}
+system("rpm", "-e", @toremove);
+
+
+sub load_provides {
+    local *F;
+    open F, "$DIR/depslist" or return;
+    foreach (<F>) {
+	my ($p, $size, @l) = split;
+	$size{$p} = $size;
+	push @{$provides{$_}}, $p foreach @l;
+    }
+}
+sub toMb {
+    my $nb = $_[0] / 1024 / 1024;
+    int $nb + 0.5;
+}
diff --git a/urpme b/urpme
new file mode 100644
index 00000000..a4a8cb99
--- /dev/null
+++ b/urpme
@@ -0,0 +1,68 @@
+#!/usr/bin/perl
+
+local $_ = join '', @ARGV;
+
+/-h/ || @ARGV == 0 and die "usage: rpme [-a] [--auto] <packages...>\n";
+
+$matches = /-a/;
+$auto = /-auto/;
+
+my $DIR = "/var/lib/urpmi";
+
+@l = grep { !/^-/ } @ARGV;
+if (!$matches) {
+    @m = map { chop; $_ } `rpm -q @l 2>&1`;
+    if ($?) {
+	$maymatch = "unknown package(s) " . join(", ", map { /package (\S+) is not installed/ ? $1 : () } @m) . "\n";
+	$auto || @l > 1 and die $maymatch;
+    }
+}
+if ($matches || $maymatch) {
+    my $match = join "|", @l;
+    @m = grep { /$match/ } map { chop; $_ } `rpm -qa`;
+
+    if ($maymatch) {
+	@m or die $maymatch;
+	print "Using $match as a substring, I found:\n@m\nRemove them all? (y/N) ";
+	<STDIN> =~ /y/i or exit 1;
+    }
+}
+
+load_provides();
+my %toremove; @toremove{$_, @{$provides{$_} || []}} = () foreach @m;
+my $changed = 1; while ($changed) { $changed = 0;
+    local *F;
+    open F, "rpm -e --test " . join(" ", keys %toremove) . " 2>&1 |";
+    foreach (<F>) {
+    	if (/package (\S+) is not installed/) {
+    	    delete $toremove{$1};
+    	} elsif (/is needed by (\S+)/ && ! exists $toremove{$1}) {
+    	    $toremove{$1} = 1;
+    	    $changed = 1;
+    	}
+    }
+}
+my @toremove = keys %toremove or die "nothing to remove\n";
+if (@toremove > @l && !$auto) {
+    my $sum = 0; map { $sum += $_ } `rpm -q --queryformat "%{SIZE}\n" @toremove`;
+    print "To satisfy dependencies, the following packages are going to be removed";
+    printf " (%d MB)", toMb($sum);
+    print ":\n@toremove\nIs it ok? (Y/n) ";
+    <STDIN> =~ /n/i and exit 0;
+}
+system("rpm", "-e", @toremove);
+
+
+sub load_provides {
+    local *F;
+    open F, "$DIR/depslist" or return;
+    foreach (<F>) {
+	my ($p, $size, @l) = split;
+	$size{$p} = $size;
+	push @{$provides{$_}}, $p foreach @l;
+    }
+}
+sub toMb {
+    my $nb = $_[0] / 1024 / 1024;
+    int $nb + 0.5;
+}
diff --git a/urpmi b/urpmi
index 7b7ba2b0..616b4ccf 100755
--- a/urpmi
+++ b/urpmi
@@ -5,7 +5,7 @@ load_po();
 $ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
 delete $ENV{ENV};
 delete $ENV{BASH_ENV};
-$< = $>;
+($<, $uid) = ($>, $<);
 
 if (@ARGV and $ARGV[0] =~ /^-?-h/) {
     shift @ARGV;
@@ -47,7 +47,15 @@ select STDERR; $| = 1;     # make unbuffered
 select STDOUT; $| = 1;     # make unbuffered
 
 open F, $depsfile or die "run urpmi.addmedia first\n";
-foreach (<F>) {
+
+if (@files = map { untaint($_) } grep { -e $_ } @ARGV) {
+    $uid == 0 or die _("Only superuser is allowed to install local packages");
+    open G, "gendepslist2 @files -- $dir/hdlist*.cz2 2>/dev/null |";
+    -e $_ and s|(.*/)?(.*)\.[^.]+\.rpm$|$2| foreach @ARGV;
+    m|^/| or $_ = "./$_" foreach @files;
+}
+
+foreach (<F>, <G>) {
     my ($pack, $size, $deps) = /(\S+)\s+(\S+)\s+(.*)/ or die("urpmi: bad format file $depsfile\n");
     $size{$pack} = $size;
     $deps{$pack} = [ split ' ', $deps ];
@@ -61,7 +69,8 @@ foreach (<F>) {
 	$pack =~ /$_/i and push @{$foundi{$v}}, $pack; 
     }
 }
-close F or die();
+close F;
+close G or die "gendepslist2 failed" if @files;
 
 my $ok = 1;
 foreach (@ARGV) {
@@ -110,9 +119,14 @@ $to_install = join '|', map { quotemeta($_) } @to_install;
 foreach $list (rpmlistfiles($dir)) {
     open F, "$dir/$list" or die("urpmi: error opening $list\n");
     $list =~ s/list\.//;
-    foreach (<F>) { chop; m|/($to_install)| and $long{$1} = $_, $name{$1} = $file; }
+    foreach (<F>) { chop; m|/($to_install)| and $long{$1} = $_, $name{$1} = $list }
     close F;
 }
+
+foreach (@files) { 
+    m|/($to_install)| and $long{$1} = $_
+}
+
 foreach $l (@to_install) {
     local $_ = $long{$l} or die("urpmi: package $l is not available\n");
     if (s|removable_(\w+)_(\d*):/||) {
@@ -167,6 +181,8 @@ sub install {
 	message(_("Installation failed"));
 	$X and exit 1; #- grpmi handles --nodeps and --force by itself
 
+	m|^/| && !-e $_ and exit 1 foreach @_; #- missing local file
+
 	print SAVEOUT _("Try installation without cheking dependencies?"), " (Y/n) ";
 	<STDIN> =~ /n/i and exit 1;
 	system("rpm", "-U", "--nodeps", @_);	
@@ -189,11 +205,14 @@ sub closure_deps {
 	exists $installed{$name} && le_version([$v, $r], $installed{$name}) and next;
 
 	$to_install->{$_} = undef;
+	my @notfound;
 	my @d = @{$deps{$_}} or return $_;
       up: foreach (@d) {
 	  my %l; 
 	  foreach (split '\|') { 
 	      exists $to_install->{$_} and next up;
+	      /^NOTFOUND_(.*)/ and push(@notfound, $1), next up;
+
 	      my ($name, $v, $r) = /(.*)-([^-]+)-([^-]+)/;
 	      if (exists $installed{$name}) {
 		  le_version([$v, $r], $installed{$name}) and next up;
@@ -224,6 +243,10 @@ sub closure_deps {
 	  }
 	  closure_deps($to_install, $l);
       }
+      if (@notfound) {
+	  message(_("Failed dependencies: %s requires %s", $_, join(", ", @notfound)));
+	  exit 1;
+      }
     }
 }
 
diff --git a/urpmi.addmedia b/urpmi.addmedia
index 468e675d..be89cdf1 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -86,7 +86,13 @@ my $RPMLIST = "$DIR/list.$name";
 !-e $HDLIST || unlink $HDLIST or die "can't remove $HDLIST";
 
 if (my ($prefix, $dir) = $url =~ m,^(removable_.*?|file):/(.*),) {
-    if (-e (my $f = "$dir/Mandrake/base/hdlist.cz2")) {
+    my $f;
+    if ($dir =~ /RPMS(.*)$/) {
+	$f = "$dir/Mandrake/base/hdlist$1.cz2";
+	$f = "$dir/../base/hdlist$1.cz2" unless -e $f;
+	$f = "$dir/../hdlist$1.cz2" unless -e $f;
+    }
+    if (-e $f) {
 	system("cp -f $f $HDLIST");
     } else {
 	system("genhdlist_cz2 -o $HDLIST $dir");
diff --git a/urpmi.spec b/urpmi.spec
index 546a43ea..b7da4a60 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 1.1
-Release: 1mdk
+Release: 3mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Summary: User mode rpm install
@@ -16,7 +16,88 @@ well-known rpms to be installed.
 
 You can compare rpm vs. urpmi  with  insmod vs. modprobe
 
+%package -n gurpmi
+Version: 0.5
+Summary: User mode rpm GUI install
+Requires: urpmi grpmi gchooser gmessage
+Group: %{group}
+%description -n gurpmi
+gurpmi enable non-superuser install of rpms. In fact, it only authorizes
+well-known rpms to be installed.
+
+You can compare rpm vs. urpmi  with  insmod vs. modprobe
+
+%package -n autoirpm
+Version: 0.3
+Summary: Auto install of rpm on demand
+Requires: sh-utils urpmi gurpmi xtest gmessage gurpmi
+Group: %{group}
+
+%description -n autoirpm
+Auto install of rpm on demand
+
+
+%prep
+%setup -n %{name}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make PREFIX=$RPM_BUILD_ROOT install
+install -d $RPM_BUILD_ROOT/var/lib/urpmi/autoirpm.scripts
+install -m 644 autoirpm.deny $RPM_BUILD_ROOT/etc/urpmi
+
+cd $RPM_BUILD_ROOT/usr/bin ; mv -f rpm-find-leaves urpmi_rpm-find-leaves
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
+
+%pre
+groupadd -r -f urpmi
+
+%preun -n autoirpm
+autoirpm.uninstall
+
+%files
+%defattr(-,root,root)
+%attr(0755, root, urpmi) %dir /etc/urpmi
+%attr(0755, root, urpmi) %dir /var/lib/urpmi
+%attr(4750, root, urpmi) /usr/bin/urpmi
+/usr/bin/urpmi_rpm-find-leaves
+/usr/bin/rpmf
+/usr/sbin/rpme
+/usr/sbin/urpmi.*
+/usr/share/locale/*/LC_MESSAGES/urpmi.po
+/usr/man/man*/urpmi*
+/usr/man/man*/rpmf*
+
+%files -n gurpmi
+%defattr(-,root,root)
+/usr/X11R6/bin/gurpmi
+
+%files -n autoirpm
+%defattr(-,root,root)
+%dir /var/lib/urpmi/autoirpm.scripts
+/etc/urpmi/autoirpm.deny
+/usr/sbin/autoirpm.*
+/usr/man/man*/autoirpm*
+/usr/bin/_irpm
+%doc README-autoirpm-icons autoirpm.README
+
+
 %changelog
+* Sun Mar 26 2000 Pixel <pixel@mandrakesoft.com> 1.1-3mdk
+- urpmi can handle package files given on command line. It finds out the
+dependencies if possible.
+- added rpme (try it, you'll like it!)
+- don't try nodeps if file is missing
+- new group
+- adapted urpmi.addmedia to new hdlist's / multi-cd
+- adapted autoirpm.update-all to new rpmlib
+
+* Thu Mar 16 2000 Pixel <pixel@mandrakesoft.com> 1.1-2mdk
+- increase version number of gurpmi and autoirpm
+
 * Tue Mar  7 2000 Pixel <pixel@mandrakesoft.com> 1.1-1mdk
 - new version, compatible with new DrakX and new rpmtools
 - add man page for rpmf
@@ -112,70 +193,3 @@ You can compare rpm vs. urpmi  with  insmod vs. modprobe
 
 * Mon Nov 15 1999 Pixel <pixel@linux-mandrake.com>
 - changed the handling of urpmi, added urpmi.addmedia...
-
-%package -n gurpmi
-Version: 0.4
-Summary: User mode rpm GUI install
-Requires: urpmi grpmi gchooser gmessage
-Group: %{group}
-%description -n gurpmi
-gurpmi enable non-superuser install of rpms. In fact, it only authorizes
-well-known rpms to be installed.
-
-You can compare rpm vs. urpmi  with  insmod vs. modprobe
-
-%package -n autoirpm
-Version: 0.2
-Summary: Auto install of rpm on demand
-Requires: sh-utils urpmi gurpmi xtest gmessage gurpmi
-Group: %{group}
-
-%description -n autoirpm
-Auto install of rpm on demand
-
-
-%prep
-%setup -n %{name}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT install
-install -d $RPM_BUILD_ROOT/var/lib/urpmi/autoirpm.scripts
-install -m 644 autoirpm.deny $RPM_BUILD_ROOT/etc/urpmi
-
-cd $RPM_BUILD_ROOT/usr/bin ; mv -f rpm-find-leaves urpmi_rpm-find-leaves
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
-
-%pre
-groupadd -r -f urpmi
-
-%preun -n autoirpm
-autoirpm.uninstall
-
-%files
-%defattr(-,root,root)
-%attr(0755, root, urpmi) %dir /etc/urpmi
-%attr(0755, root, urpmi) %dir /var/lib/urpmi
-%attr(4750, root, urpmi) /usr/bin/urpmi
-/usr/bin/urpmi_rpm-find-leaves
-/usr/bin/rpmf
-/usr/sbin/urpmi.*
-/usr/share/locale/*/LC_MESSAGES/urpmi.po
-/usr/man/man*/urpmi*
-/usr/man/man*/rpmf*
-
-%files -n gurpmi
-%defattr(-,root,root)
-/usr/X11R6/bin/gurpmi
-
-%files -n autoirpm
-%defattr(-,root,root)
-%dir /var/lib/urpmi/autoirpm.scripts
-/etc/urpmi/autoirpm.deny
-/usr/sbin/autoirpm.*
-/usr/man/man*/autoirpm*
-/usr/bin/_irpm
-%doc README-autoirpm-icons autoirpm.README