no_comment

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