- API: uncouple fadio from rest of rpmio.

- API: externalize legacy fdOpen interface for rpmfind et al.

CVS patchset: 3873
CVS date: 2000/06/20 15:54:48

44 files changed, 639 insertions, 619 deletions

diff --git a/CHANGES b/CHANGES
index a0a3fbef7..9cd6d3baf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -64,6 +64,8 @@
 	- require --rebuilddb to convert db1 -> db3, better messages.
 	- fix: open all db indices before performing chroot.
 	- fix: typo in brp-compress caused i18n man pages not to compress.
+	- API: uncouple fadio from rest of rpmio.
+	- API: externalize legacy fdOpen interface for rpmfind et al.
 
 3.0.4 -> 3.0.5
 	- handle version 4 packaging as input.
diff --git a/build/build.c b/build/build.c
index e118b24b2..268ced106 100644
--- a/build/build.c
+++ b/build/build.c
@@ -4,8 +4,8 @@
 
 #include "system.h"
 
-#include <rpmbuild.h>
 #include <rpmio_internal.h>
+#include <rpmbuild.h>
 
 static int _build_debug = 0;
 
diff --git a/build/files.c b/build/files.c
index d1ae75a02..245ab5dec 100644
--- a/build/files.c
+++ b/build/files.c
@@ -10,9 +10,9 @@
 #include <regex.h>
 #include <signal.h>	/* getOutputFrom() */
 
+#include <rpmio_internal.h>
 #include <rpmbuild.h>
 #include <rpmmacro.h>
-#include <rpmio_internal.h>
 
 #include "buildio.h"
 
diff --git a/build/pack.c b/build/pack.c
index 2e64a8020..a2bb92ed1 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -4,8 +4,8 @@
 
 #include "system.h"
 
-#include <rpmbuild.h>
 #include <rpmio_internal.h>
+#include <rpmbuild.h>
 #include "buildio.h"
 
 #include "misc.h"
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index 9b151177a..49fa0ee9a 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -6,8 +6,8 @@
 
 static int _debug = 0;
 
-#include <rpmbuild.h>
 #include <rpmio_internal.h>
+#include <rpmbuild.h>
 
 static int_32 copyTagsDuringParse[] = {
     RPMTAG_EPOCH,
diff --git a/build/parsePrep.c b/build/parsePrep.c
index 82061f2f3..c0cc6eb9b 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -4,8 +4,8 @@
 
 #include "system.h"
 
-#include <rpmbuild.h>
 #include <rpmio_internal.h>
+#include <rpmbuild.h>
 
 /* These have to be global to make up for stupid compilers */
     static int leaveDirs, skipDefaultAction;
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 847948ec5..38cefbd66 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -6,8 +6,8 @@
 
 static int _debug = 0;
 
-#include <rpmbuild.h>
 #include <rpmio_internal.h>
+#include <rpmbuild.h>
 
 static struct PartRec {
     int part;
diff --git a/convertdb.c b/convertdb.c
index 912bc6507..d38d3ce1e 100644
--- a/convertdb.c
+++ b/convertdb.c
@@ -2,12 +2,13 @@
 
 #include "system.h"
 
-#include "build/rpmbuild.h"
+#include <rpmio_internal.h>
+#include <rpmbuild.h>
+#include <rpmdb.h>
 
 #include "falloc.h"
 #include "oldrpmdb.h"
 #include "oldheader.h"
-#include "lib/rpmdb.h"
 
 int convertDB(void);
 
diff --git a/lib/db1.c b/lib/db1.c
index 5e60de6fd..dcb8e943c 100644
--- a/lib/db1.c
+++ b/lib/db1.c
@@ -10,10 +10,10 @@ static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 
 #define	_mymemset(_a, _b, _c)
 
+#include <rpmio_internal.h>
 #include <rpmlib.h>
 #include <rpmmacro.h>	/* XXX rpmGenPath */
 #include <rpmurl.h>	/* XXX urlGetPath */
-#include <rpmio_internal.h>
 
 #include "falloc.h"
 #include "misc.h"
diff --git a/lib/falloc.h b/lib/falloc.h
index 64861c47a..0bb107bbe 100644
--- a/lib/falloc.h
+++ b/lib/falloc.h
@@ -9,6 +9,22 @@
 extern "C" {
 #endif
 
+static inline long int fadGetFileSize(FD_t fd) {
+    return fd->fileSize;
+}
+
+static inline void fadSetFileSize(FD_t fd, long int fileSize) {
+    fd->fileSize = fileSize;
+}
+
+static inline unsigned int fadGetFirstFree(FD_t fd) {
+    return fd->firstFree;
+}
+
+static inline void fadSetFirstFree(FD_t fd, unsigned int firstFree) {
+    fd->firstFree = firstFree;
+}
+
 /*@null@*/ FD_t	fadOpen		(const char * path, int flags, mode_t perms);
 unsigned int	fadAlloc	(FD_t fd, unsigned int size); /* 0 on failure */
 void		fadFree		(FD_t fd, unsigned int offset);
diff --git a/po/cs.po b/po/cs.po
index dfd211149..5eb218438 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -66,33 +66,33 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "chyba pøi hledání balíèku %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 #, fuzzy
 msgid "RPM database already exists"
 msgstr "doèasná databáze %s ji¾ existuje"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3991,67 +3991,67 @@ msgstr "chybí      %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: "
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 #, fuzzy
 msgid "Bad server response"
 msgstr "Chybná odezva serveru FTP"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 #, fuzzy
 msgid "Server IO error"
 msgstr "V/V chyba FTP"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 #, fuzzy
 msgid "Server timeout"
 msgstr "Promlka serveru FTP"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Nelze vyhledat adresu hostitelského serveru FTP"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Nelze vyhledat název hostitelského serveru FTP"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "K serveru FTP se nelze pøipojit"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Se serverem FTP nelze navázat datové spojení"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "V/V chyba na místní soubor"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pøi nastavení vzdáleného serveru na pasivní re¾im"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "Soubor nebyl na serveru nalezen"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Neznámá nebo neèekaná chyba FTP"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "probíhá pøihla¹ování na %s jako %s, h. %s\n"
diff --git a/po/da.po b/po/da.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index ac067b0d8..5734faf2d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -101,33 +101,33 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 #, fuzzy
 msgid "RPM database already exists"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -4115,67 +4115,67 @@ msgstr "fehlende { nach %{"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 #, fuzzy
 msgid "Bad server response"
 msgstr "Nicht passende Antwort des FTP-Servers"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP IO-Fehler"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 #, fuzzy
 msgid "Server timeout"
 msgstr "Timeout des FTP-Servers"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Verbindung zum FTP-Server fehlgeschlagen"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "IO-Fehler bei lokaler Datei"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP Unbekannter oder nicht erwarteter Fehler"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index c8fd198f7..a84e5a044 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -72,33 +72,33 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 #, fuzzy
 msgid "RPM database already exists"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -4032,67 +4032,67 @@ msgstr "puuttuva '{' '%':n jälkeen"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 #, fuzzy
 msgid "Bad server response"
 msgstr "Virheellinen FTP-palvelijan vastaus"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP:n IO-virhe"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 #, fuzzy
 msgid "Server timeout"
 msgstr "FTP-palvelimen timeout"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "FTP-palvelimen osoitetta ei löytynyt"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "FTP-palvelimen nimeä ei löytynyt"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "En saanut yhteyttä FTP-palvelijaan"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "En saanut data-yhteyttä FTP-palvelijaan"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "Paikallisen tiedoston IO-virhe"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "Virhe asetettaessa palvelinta passiiviin moodiin"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP:n tuntematon tai odottamaton virhe"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 8524bba3b..a1050f698 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-06-19 07:25-0400\n"
+msgstr "POT-Creation-Date: 2000-06-20 11:41-0400\n"
 
 #: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:425
 #, c-format
@@ -53,32 +53,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -4008,59 +4008,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 2b7d245f8..5081cc60c 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 1.0\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "PO-Revision-Date: 2000-06-16 02:20+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -60,32 +60,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr "RPM gagnagrunnur er þegar til"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr "Gamla gagnagrunninn vantar"
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr "gat ekki búið til RPM gagnagrunninn /var/lib/rpm"
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr "Gamli gagnagrunnurinn er skemmdur"
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3761,59 +3761,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 14959a898..abc7179ad 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -66,33 +66,33 @@ msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n"
 msgid "Building for target %s\n"
 msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 #, fuzzy
 msgid "RPM database already exists"
 msgstr "RPM ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr "¸Å¤¤ db ¤¬¸«Åö¤¿¤ê¤Þ¤»¤ó"
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr "/var/lib/rpm ¤Ë RPM ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºîÀ®¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr "¸Å¤¤ db ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr "oldrpmdbGetPackageInfo ¤Î¼ºÇÔ &olddb = %p olddb.packages = %p\n"
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr "rpmconvert: °ú¿ô¤Ï¤³¤³¤ËÍè¤Þ¤»¤ó"
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr "rpmconvert 1.0 - /var/lib/rpm Ãæ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÑ´¹Ãæ\n"
 
@@ -127,7 +127,7 @@ msgstr "copyright ¤¬¤¢¤ê¤Þ¤»¤ó!\n"
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.77 2000/06/19 11:35:30 jbj Exp $
+# $Id: ja.po,v 1.78 2000/06/20 15:54:49 jbj Exp $
 #: rpm.c:177 rpmqv.c:256
 #, c-format
 msgid "rpm: %s\n"
@@ -3978,67 +3978,67 @@ msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:"
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr "À®¸ù"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 #, fuzzy
 msgid "Bad server response"
 msgstr "¥µ¡¼¥Ð¤«¤éÀµ¾ï¤Ê±þÅú¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 #, fuzzy
 msgid "Server IO error"
 msgstr "¥µ¡¼¥Ð IO ¥¨¥é¡¼"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 #, fuzzy
 msgid "Server timeout"
 msgstr "¥µ¡¼¥Ð¥¿¥¤¥à¥¢¥¦¥È"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È¥¢¥É¥ì¥¹¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "¥µ¡¼¥Ð¤È¤Î¥Ç¡¼¥¿¥³¥Í¥¯¥·¥ç¥ó¤Î³ÎΩ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Î IO ¥¨¥é¡¼"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "¥ê¥â¡¼¥È¥µ¡¼¥Ð¤Î¥Ñ¥Ã¥·¥Ö¥â¡¼¥ÉÀßÄꥨ¥é¡¼"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "¥µ¡¼¥Ð¾å¤Ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr "½èÍýÃæ¤Î¥¢¥Ü¡¼¥È"
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "ÉÔÌÀ¤â¤·¤¯¤Ïͽ´ü¤»¤Ì¥¨¥é¡¼"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "%s ¤Ø %s pw %s ¤È¤·¤Æ¥í¥°¥¤¥óÃæ\n"
diff --git a/po/ko.po b/po/ko.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 139191130..8cd84f89c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -67,34 +67,34 @@ msgstr "Budowanie dla platform: %s\n"
 msgid "Building for target %s\n"
 msgstr "Budowanie dla %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr "Baza RPM'a ju¿ istnieje"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr "Brak starej bazy"
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr "Nie mo¿na utworzyæ bazy w /var/lib/rpm"
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr "Stara baza jest uszkodzona"
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 "Wykonanie oldrpmdbGetPackageInfo nie powiod³o siê &olddb = %p olddb.packages "
 "= %p\n"
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr "rpmconvert nie wymaga argumentów"
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr "rpmconvert 1.0 - konwersja bazy w /var/lib/rpm\n"
 
@@ -3945,59 +3945,59 @@ msgstr "brak    %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: "
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr "Sukces"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr "B³êdna odpowied¼ serwera"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr "B³±d WE/WY(IO) serwera"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr "Przekroczony limit czasu serwera"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr "Nie mo¿na znale¼æ adresu serwera"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr "Nie mo¿na znale¼æ nazwy serwera"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr "Po³±czenie z serwerem nie powiod³o siê"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr "Otwarcie transmisji danych z serwera nie powiod³o siê"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "B³±d WE/WY(IO) na lokalnym pliku"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "B³±d: ustawienie zdalnego serwera w tryb pasywny nie powiod³o siê"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "Plik nie zosta³ znaleziony na serwerze"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr "Przerywanie ..."
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr "Nieznany lub nieoczekiwany b³±d"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "logowanie do %s jako %s, has³o %s\n"
diff --git a/po/pt.po b/po/pt.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cf47d209f..36d6370c9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-06-19 07:25-0400\n"
+msgstr "POT-Creation-Date: 2000-06-20 11:41-0400\n"
 
 #: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:425
 #, c-format
@@ -60,32 +60,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "instale pacote"
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -4143,59 +4143,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index b9b2ca78f..833e8ab93 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -60,32 +60,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3761,59 +3761,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index cc7059bdc..8dbe3dfab 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index e6cd1a80e..92aa52b03 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,33 +59,33 @@ msgstr "ãÅÌÅ×ÙÅ ÐÌÁÔÆÏÒÍÙ: %s\n"
 msgid "Building for target %s\n"
 msgstr "óÂÏÒËÁ ÄÌÑ ÃÅÌÅ×ÏÊ ÐÌÁÔÆÏÒÍÙ %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr "âÁÚÁ ÄÁÎÎÙÈ RPM ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ"
 
-#: convertdb.c:55
+#: convertdb.c:56
 #, fuzzy
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr "ÎÅÕÄÁÞÁ ÓÏÚÄÁÎÉÑ ÂÁÚÙ ÄÁÎÎÙÈ RPM /var/state/rpm"
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr "óÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÐÏ×ÒÅÖÄÅÎÁ"
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr "ÎÅÕÄÁÞÁ oldrpmdbGetPackageInfo: &olddb = %p olddb.packages = %p\n"
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr "rpmconvert: ÁÒÇÕÍÅÎÔÙ ÎÅ ÎÕÖÎÙ"
 
-#: convertdb.c:210
+#: convertdb.c:211
 #, fuzzy
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr "rpmconvert 1.0 - ËÏÎ×ÅÒÔÉÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ × /var/state/rpm\n"
@@ -3944,59 +3944,59 @@ msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: "
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr "õÄÁÌÏÓØ"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr "îÅ×ÅÒÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr "ôÁÊÍÁÕÔ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ IP-ÁÄÒÅÓ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÉÍÑ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ Ó ÓÅÒ×ÅÒÏÍ"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ × ÌÏËÁÌØÎÙÊ ÆÁÊÌ"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÐÅÒÅ×ÏÄÅ ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ × ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr "ïÔÍÅÎÁ × ÐÒÏÃÅÓÓÅ"
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n"
diff --git a/po/sk.po b/po/sk.po
index 88b9f842b..80b6d3db1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -61,32 +61,32 @@ msgstr "predefinova» cieµovú platformu"
 msgid "Building for target %s\n"
 msgstr "vyhµadáva sa balík %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr "RPM databáza u¾ existuje"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr "Stará databáza neexistuje"
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr "Nepodarilo sa vytvori» RPM databázu /var/lib/rpm"
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr "Stará databáze je po¹kodená"
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr "oldrpmdbGetPackageInfo zlyhal &olddb = %p olddb.packages = %p\n"
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr "rpmconvert: argumenty nie sú oèakávané"
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr "rpmconvert 1.0 - konverzia databázy v /var/lib/rpm\n"
 
@@ -3953,59 +3953,59 @@ msgstr "chýbajúce    %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: "
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr "Úspech"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr "Chybná odpoveï servera"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr "Chyba vstupu/výstupu servera"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr "Prekroèenie èasového limitu servera"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr "Nie je mo¾né vyhµada» adresu servera"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr "Nie je mo¾né vyhµada» názov servera"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr "Pripojenie k serveru zlyhalo"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr "Vytvorenie dátového spojenia k serveru zlyhalo"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "Chyba vstupu/výstupu lokálneho súboru"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pri nastavení vzdialeného servera do pasívneho re¾imu"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "Súbor sa na serveri nenachádza"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr "Zru¹enie prebieha"
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr "Neznáma alebo neoèakávaná chyba"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "prihlasuje sa na %s ako %s, heslo %s\n"
diff --git a/po/sl.po b/po/sl.po
index c1721a905..480596311 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.62 2000/06/19 11:35:31 jbj Exp $
+# $Id: sl.po,v 1.63 2000/06/20 15:54:49 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -65,32 +65,32 @@ msgstr "Izgradnja za ciljna strojna okolja: %s\n"
 msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr "Podatovna zbirka RPM ¾e obstaja"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr "Stara podatkovna zbirka manjka"
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr "podatkovne zbirke RPM /var/lib/rpm ni uspelo ustvariti"
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr "Stara podatkovna zbirka je po¹kodovana"
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr "oldrpmdbGetPackageInfo neuspe¹en &olddb = %p olddb.packages = %p\n"
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr "rpmconvert: argumentov ne prièakujemo"
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr "rpmconvert 1.0 - pretvorba podatkovne zbirke v /var/lib/rpm\n"
 
@@ -3932,59 +3932,59 @@ msgstr "manjka     %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr "Uspe¹no"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr "Okvarjen odziv stre¾nika"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr "V/I napaka na stre¾niku"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr "Potekel èas na stre¾niku"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr "Naslov stre¾nika ni ugotovljiv"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr "Ime stre¾nika ni ugotovljivo"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr "Neuspe¹en poskus prikljuèitve na stre¾nik"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr "Neuspe¹na vzpostavitev podatkovne povezave s stre¾nikom"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "V/I napaka na lokalni datoteki"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "Napaka pri nastavitvi oddaljenega stre¾nika v pasivni naèin"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "Datoteke ni mo¾no najti na stre¾niku"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr "Prekinitev v teku"
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr "Neznana ali neprièakovana napaka"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "prijava na %s kot %s, geslo %s\n"
diff --git a/po/sr.po b/po/sr.po
index 85eeb5c90..2c57cf01d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -70,33 +70,33 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "gre¹ka potrage za paketom %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 #, fuzzy
 msgid "RPM database already exists"
 msgstr "privremena baza podataka %s veæ postoji"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3979,67 +3979,67 @@ msgstr "nedostaje { posle %"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: "
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 #, fuzzy
 msgid "Bad server response"
 msgstr "Lo¹ odgovor FTP servera"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 #, fuzzy
 msgid "Server IO error"
 msgstr "Ulazno/izlazna FTP gre¹ka"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 #, fuzzy
 msgid "Server timeout"
 msgstr "Tajm-aut FTP servera"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Ne mogu da odredim host adresu FTP servera"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Ne mogu da odredim ime FTP hosta"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Ne mogu da se pove¾em sa FTP serverom"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "Ulazno/izlazna gre¹ka kod lokalne datoteke"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "Gre¹ka kod stavljanja udaljenog servera u pasivni re¾im"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "Datoteka nije pronaðena na serveru"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Neoèekivana ili nepoznata FTP gre¹ka"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 0b5309941..603cb16bf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
 # Swedish messages for RPM
 # Copyright © 1999 Free Software Foundation, Inc.
 # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.122 $
+# $Revision: 1.123 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\n"
 "PO-Revision-Date: 2000-02-21 12:20+0100\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -65,32 +65,32 @@ msgstr "Bygger målplattformar: %s\n"
 msgid "Building for target %s\n"
 msgstr "Bygger för mål %s\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr "RPM-databasen existerar redan"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr "Gammal db saknas"
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr "misslyckades att skapa RPM-databasen /var/lib/rpm"
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr "Gammal db är trasig"
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr "oldrpmdbGetPackageInfo misslyckades &olddb = %p olddb.packages = %p\n"
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr "rpmconvert: tar inga argument"
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr "rpmconvert 1.0 - konverterar databasen i /var/lib/rpm\n"
 
@@ -3920,59 +3920,59 @@ msgstr "saknas     %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Ouppfyllda beroenden för %s-%s-%s: "
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr "Lyckades"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr "Konstigt svar från server"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr "IO-fel mot server"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr "Förbindelsen med servern dog ut (timeout)"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr "Kunde inte slå upp serverns adress"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr "Kunde inte slå upp serverns namn"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr "Misslyckades med att kontakta servern"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr "Misslyckades med att etablera en dataförbindelse till servern"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "IO-fel mot lokal fil"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "Fel när den fjärrservern sattes i passivt läge"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "Filen fanns inte på servern"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr "Avbruten under gång"
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr "Okänt eller oväntat fel"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "loggar in på %s som %s, lösenord %s\n"
diff --git a/po/tr.po b/po/tr.po
index dfa7b4713..d778984d0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -67,33 +67,33 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "%s paketi bulunamadý\n"
 
-#: convertdb.c:39
+#: convertdb.c:40
 #, fuzzy
 msgid "RPM database already exists"
 msgstr "geçici veritabaný %s mevcut"
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -4032,67 +4032,67 @@ msgstr "% den sonra eksik {"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s 'nin baðýmlýlýk sorunlarý: "
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 #, fuzzy
 msgid "Bad server response"
 msgstr "FTP sunucusundan kötü yanýt"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP I/O hatasý"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 #, fuzzy
 msgid "Server timeout"
 msgstr "FTP sunucusu zaman aþýmý"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "FTP sunucusunun isim adres dönüþümü yapýlamadý"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "FTP sunucusunun adres isim dönüþümü yapýlamadý"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "FTP sunucusuna baðlanýlamadý"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "FTP sunucusu ile veri alýþveriþi yapýlamadý"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr "Yerel dosyaya eriþim sýrasýnda I/O hatasý"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr "Karþý sunucuyu pasif kipe sokam hatasý"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr "Dosya sunucuda bulunamadý"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP bilinmeyen ya da beklenmeyen hata"
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index cc7059bdc..8dbe3dfab 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-19 07:25-0400\n"
+"POT-Creation-Date: 2000-06-20 11:41-0400\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"
@@ -65,32 +65,32 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: convertdb.c:39
+#: convertdb.c:40
 msgid "RPM database already exists"
 msgstr ""
 
-#: convertdb.c:44
+#: convertdb.c:45
 msgid "Old db is missing"
 msgstr ""
 
-#: convertdb.c:55
+#: convertdb.c:56
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: convertdb.c:61
+#: convertdb.c:62
 msgid "Old db is corrupt"
 msgstr ""
 
-#: convertdb.c:70
+#: convertdb.c:71
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: convertdb.c:204
+#: convertdb.c:205
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: convertdb.c:210
+#: convertdb.c:211
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -3766,59 +3766,59 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:532
+#: rpmio/rpmio.c:529
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:532
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:535
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:538
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:541
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:544
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:547
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:550
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:553
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:556
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:559
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:562
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:569
+#: rpmio/rpmio.c:566
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1164
+#: rpmio/rpmio.c:1161
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/rpm.spec b/rpm.spec
index c3587e421..5d0a74744 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -257,6 +257,8 @@ fi
 %changelog
 * Tue Jun 20 2000 Jeff Johnson <jbj@redhat.com>
 - fix: typo in brp-compress caused i18n man pages not to compress.
+- API: uncouple fadio from rest of librpmio.
+- API: externalize legacy fdOpen interface for rpmfind et al in librpmio.
 
 * Mon Jun 19 2000 Jeff Johnson <jbj@redhat.com>
 - fix: open all db indices before performing chroot.
diff --git a/rpmio/.cvsignore b/rpmio/.cvsignore
index dcf4befde..cdaf0e3fa 100644
--- a/rpmio/.cvsignore
+++ b/rpmio/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
 .libs
 *.la
 *.lo
+trpmio
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 58c2a7bdd..0e1e44b2b 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -10,7 +10,7 @@ pkginc_HEADERS = rpmio.h rpmurl.h rpmmacro.h rpmmessages.h rpmerr.h
 noinst_HEADERS = rpmio_internal.h ugid.h
 
 lib_LTLIBRARIES = librpmio.la
-librpmio_la_SOURCES = rpmrpc.c rpmio.c url.c macro.c \
+librpmio_la_SOURCES = rpmrpc.c rpmio.c rpmio_api.c url.c macro.c \
 	ugid.c rpmmalloc.c rpmerr.c messages.c
 
 # XXX Add internal libtool dependence
@@ -25,5 +25,5 @@ lclint:
 	lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
 
 trpmio: librpmio.la trpmio.o
-	$(LINK) -o $@ trpmio.o librpmio.la
+	$(LINK) -o $@ trpmio.o librpmio.la $(top_builddir)/popt/libpopt.la
 
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index f1e9ed5ed..2300470b9 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -61,6 +61,7 @@ static int inet_aton(const char *cp, struct in_addr *inp)
 #endif
 
 #include <rpmio_internal.h>
+
 #include "ugid.h"
 #include "rpmmessages.h"
 
@@ -210,17 +211,11 @@ DBGIO(fd, (stderr, "==> fdFdopen(%p,\"%s\") fdno %d -> fp %p fdno %d\n", cookie,
 }
 #endif
 
-#undef	fdRead
-#undef	fdWrite
-#undef	fdSeek
-#undef	fdClose
 #if 0
 #undef	fdLink
 #undef	fdFree
 #undef	fdNew
 #endif
-#undef	fdFileno
-#undef	fdOpen
 
 /* =============================================================== */
 static inline FD_t XfdLink(void * cookie, const char *msg, const char *file, unsigned line) {
@@ -283,7 +278,7 @@ static inline /*@null@*/ FD_t XfdNew(const char *msg, const char *file, unsigned
     return XfdLink(fd, msg, file, line);
 }
 
-static inline ssize_t fdRead(void * cookie, /*@out@*/ char * buf, size_t count) {
+ssize_t fdRead(void * cookie, /*@out@*/ char * buf, size_t count) {
     FD_t fd = c2f(cookie);
     ssize_t rc;
 
@@ -298,7 +293,7 @@ DBGIO(fd, (stderr, "==>\tfdRead(%p,%p,%ld) rc %ld %s\n", cookie, buf, (long)coun
     return rc;
 }
 
-static inline ssize_t fdWrite(void * cookie, const char * buf, size_t count) {
+ssize_t fdWrite(void * cookie, const char * buf, size_t count) {
     FD_t fd = c2f(cookie);
     int fdno = fdFileno(fd);
     ssize_t rc;
@@ -346,7 +341,7 @@ DBGIO(fd, (stderr, "==>\tfdSeek(%p,%ld,%d) rc %lx %s\n", cookie, (long)p, whence
     return rc;
 }
 
-static inline int fdClose( /*@only@*/ void * cookie) {
+int fdClose( /*@only@*/ void * cookie) {
     FD_t fd;
     int fdno;
     int rc;
@@ -367,7 +362,7 @@ DBGIO(fd, (stderr, "==>\tfdClose(%p) rc %lx %s\n", fd, (long)rc, fdbg(fd)));
     return rc;
 }
 
-static inline /*@null@*/ FD_t fdOpen(const char *path, int flags, mode_t mode) {
+/*@null@*/ FD_t fdOpen(const char *path, int flags, mode_t mode) {
     FD_t fd;
     int fdno;
 
@@ -386,6 +381,8 @@ static struct FDIO_s fdio_s = {
 };
 FDIO_t fdio = /*@-compmempass@*/ &fdio_s /*@=compmempass@*/ ;
 
+FDIO_t fadio;	/* XXX usually NULL, filled in when linked with rpm */
+
 int fdWritable(FD_t fd, int secs)
 {
     int fdno;
diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index edf3d0a22..cf46f6bb7 100644
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -133,6 +133,15 @@ off_t	fdSize	(FD_t fd);
 /*@null@*/ FILE *fdFdopen( /*@only@*/ void * cookie, const char * mode);
 #endif
 
+/* XXX Legacy interfaces needed by gnorpm, rpmfind et al */
+
+int	fdFileno(void * cookie);
+/*@null@*/ FD_t fdOpen(const char *path, int flags, mode_t mode);
+ssize_t fdRead(void * cookie, /*@out@*/ char * buf, size_t count);
+ssize_t	fdWrite(void * cookie, const char * buf, size_t count);
+int	fdClose( /*@only@*/ void * cookie);
+
+/* XXX FD_t reference count debugging wrappers */
 #define	fdLink(_fd, _msg)	fdio->_fdref(_fd, _msg, __FILE__, __LINE__)
 #define	fdFree(_fd, _msg)	fdio->_fdderef(_fd, _msg, __FILE__, __LINE__)
 #define	fdNew(_msg)		fdio->_fdnew(_msg, __FILE__, __LINE__)
diff --git a/rpmio/rpmio_api.c b/rpmio/rpmio_api.c
new file mode 100644
index 000000000..b57717ff6
--- /dev/null
+++ b/rpmio/rpmio_api.c
@@ -0,0 +1,13 @@
+#include "system.h"
+
+/* XXX rename the static inline version of fdFileno */
+#define	fdFileno	_fdFileno
+#include <rpmio_internal.h>
+#undef	fdFileno
+
+int fdFileno(void * cookie) {
+    FD_t fd;
+    if (cookie == NULL) return -2;
+    fd = c2f(cookie);
+    return fd->fps[0].fdno;
+}
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index 2146dd8aa..1ca0b8a94 100644
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -1,6 +1,8 @@
 #ifndef	H_RPMIO_INTERNAL
 #define	H_RPMIO_INTERNAL
 
+static inline int fdFileno(void * cookie);
+
 #include <rpmio.h>
 #include <rpmurl.h>
 #include <assert.h>
@@ -236,7 +238,6 @@ static inline FD_t c2f(void * cookie) {
     return fd;
 }
 
-#undef	fdFileno
 static inline int fdFileno(void * cookie) {
     FD_t fd;
     if (cookie == NULL) return -2;
@@ -244,26 +245,6 @@ static inline int fdFileno(void * cookie) {
     return fd->fps[0].fdno;
 }
 
-static inline long int fadGetFileSize(FD_t fd) {
-    FDSANE(fd);
-    return fd->fileSize;
-}
-
-static inline void fadSetFileSize(FD_t fd, long int fileSize) {
-    FDSANE(fd);
-    fd->fileSize = fileSize;
-}
-
-static inline unsigned int fadGetFirstFree(FD_t fd) {
-    FDSANE(fd);
-    return fd->firstFree;
-}
-
-static inline void fadSetFirstFree(FD_t fd, unsigned int firstFree) {
-    FDSANE(fd);
-    fd->firstFree = firstFree;
-}
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/rpmio/trpmio.c b/rpmio/trpmio.c
index 4e0d3a8d3..ccb602e10 100644
--- a/rpmio/trpmio.c
+++ b/rpmio/trpmio.c
@@ -2,8 +2,6 @@
  
 #include "rpmio.h"
 
-FDIO_t fadio = NULL;		/* XXX this wartlet will be removed */
- 
 int main (void)
 {
     FD_t f1, f2, f3, f4, f5;